[pkg-kde-commits] rev 2754 - trunk/packages/kdebase/debian/patches

Adeodato Simó adeodato at costa.debian.org
Fri Jan 6 15:11:23 UTC 2006


Author: adeodato
Date: 2006-01-06 15:10:44 +0000 (Fri, 06 Jan 2006)
New Revision: 2754

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


Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-01-06 14:25:38 UTC (rev 2753)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-01-06 15:10:44 UTC (rev 2754)
@@ -1,5 +1,76 @@
 #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 @@
@@ -2871,47 +2942,17 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
---- applnk/compat/Makefile.in
-+++ applnk/compat/Makefile.in
-@@ -262,6 +262,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2921,8 +2962,26 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -2930,7 +2989,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -659,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2942,18 +3001,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +760,7 @@
+@@ -1024,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:
---- applnk/Makefile.in
-+++ applnk/Makefile.in
-@@ -279,6 +279,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2963,17 +3030,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,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 +624,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -2981,7 +3048,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2993,15 +3060,27 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -1024,7 +1027,7 @@
+@@ -757,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:
+--- 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 @@
@@ -3028,7 +3107,7 @@
  #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 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 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 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=''
  
  # Initialize some variables set by options.
@@ -3041,7 +3120,16 @@
    --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
-@@ -1213,7 +1215,7 @@
+@@ -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 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -3050,7 +3138,7 @@
    done
  fi
  
-@@ -2116,6 +2118,31 @@
+@@ -2116,6 +2120,31 @@
  
  
  
@@ -3082,7 +3170,7 @@
  
    unset CDPATH
  
-@@ -3049,8 +3076,7 @@
+@@ -3049,8 +3078,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3092,7 +3180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3108,8 +3134,7 @@
+@@ -3108,8 +3136,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3102,7 +3190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3225,8 +3250,7 @@
+@@ -3225,8 +3252,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3112,7 +3200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3280,8 +3304,7 @@
+@@ -3280,8 +3306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3122,7 +3210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3326,8 +3349,7 @@
+@@ -3326,8 +3351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3132,7 +3220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3371,8 +3393,7 @@
+@@ -3371,8 +3395,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3142,7 +3230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3929,8 +3950,7 @@
+@@ -3929,8 +3952,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3152,7 +3240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3988,8 +4008,7 @@
+@@ -3988,8 +4010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3162,7 +3250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4060,8 +4079,7 @@
+@@ -4060,8 +4081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3172,7 +3260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4105,8 +4123,7 @@
+@@ -4105,8 +4125,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3182,7 +3270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4284,8 +4301,7 @@
+@@ -4284,8 +4303,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3192,7 +3280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4396,8 +4412,7 @@
+@@ -4396,8 +4414,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3202,7 +3290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4485,8 +4500,7 @@
+@@ -4485,8 +4502,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3212,7 +3300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4588,8 +4602,7 @@
+@@ -4588,8 +4604,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3222,7 +3310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4688,8 +4701,7 @@
+@@ -4688,8 +4703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3232,7 +3320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4773,8 +4785,7 @@
+@@ -4773,8 +4787,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3242,7 +3330,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4863,8 +4874,7 @@
+@@ -4863,8 +4876,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3252,7 +3340,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4951,8 +4961,7 @@
+@@ -4951,8 +4963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3262,7 +3350,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5039,8 +5048,7 @@
+@@ -5039,8 +5050,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3272,7 +3360,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5146,8 +5154,7 @@
+@@ -5146,8 +5156,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3282,7 +3370,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5234,8 +5241,7 @@
+@@ -5234,8 +5243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3292,7 +3380,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5322,8 +5328,7 @@
+@@ -5322,8 +5330,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3302,7 +3390,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5410,8 +5415,7 @@
+@@ -5410,8 +5417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3312,7 +3400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5542,8 +5546,7 @@
+@@ -5542,8 +5548,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3322,7 +3410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5631,8 +5634,7 @@
+@@ -5631,8 +5636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3332,7 +3420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5719,8 +5721,7 @@
+@@ -5719,8 +5723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3342,7 +3430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5807,8 +5808,7 @@
+@@ -5807,8 +5810,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3352,7 +3440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5895,8 +5895,7 @@
+@@ -5895,8 +5897,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3362,7 +3450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5983,8 +5982,7 @@
+@@ -5983,8 +5984,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3372,7 +3460,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6407,8 +6405,7 @@
+@@ -6407,8 +6407,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3382,7 +3470,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6534,8 +6531,7 @@
+@@ -6534,8 +6533,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3392,7 +3480,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6623,8 +6619,7 @@
+@@ -6623,8 +6621,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3402,7 +3490,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6707,185 +6702,6 @@
+@@ -6707,185 +6704,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -3588,7 +3676,7 @@
    fi
  
  
-@@ -7049,7 +6865,7 @@
+@@ -7049,7 +6867,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
@@ -3597,7 +3685,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7154,7 +6970,7 @@
+@@ -7154,7 +6972,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,
@@ -3606,7 +3694,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 +7004,7 @@
+@@ -7188,7 +7006,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -3615,7 +3703,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7218,6 +7034,15 @@
+@@ -7218,6 +7036,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3631,7 +3719,7 @@
  
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7304,44 +7129,36 @@
+@@ -7304,44 +7131,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -3686,7 +3774,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7357,7 +7174,7 @@
+@@ -7357,7 +7176,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -3695,7 +3783,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 +7191,21 @@
+@@ -7374,42 +7193,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -3745,7 +3833,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 +7224,14 @@
+@@ -7428,19 +7226,14 @@
    ;;
  
  openbsd*)
@@ -3767,7 +3855,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7450,7 +7241,6 @@
+@@ -7450,7 +7243,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -3775,16 +3863,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7527,7 +7317,7 @@
+@@ -7527,7 +7319,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7530 "configure"' > conftest.$ac_ext
-+  echo '#line 7320 "configure"' > conftest.$ac_ext
++  echo '#line 7322 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7570,14 +7360,13 @@
+@@ -7570,14 +7362,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -3801,7 +3889,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7589,7 +7378,6 @@
+@@ -7589,7 +7380,6 @@
        esac
        ;;
      *64-bit*)
@@ -3809,7 +3897,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7649,8 +7437,7 @@
+@@ -7649,8 +7439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3819,7 +3907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7725,8 +7512,7 @@
+@@ -7725,8 +7514,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3829,7 +3917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7896,8 +7682,7 @@
+@@ -7896,8 +7684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3839,7 +3927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7964,8 +7749,7 @@
+@@ -7964,8 +7751,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3849,7 +3937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8080,6 +7864,243 @@
+@@ -8080,6 +7866,243 @@
  
  done
  
@@ -4093,16 +4181,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 +8193,7 @@
+@@ -8172,7 +8195,7 @@
  
  
  # Provide some information about the compiler.
 -echo "$as_me:8175:" \
-+echo "$as_me:8196:" \
++echo "$as_me:8198:" \
       "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 +8239,7 @@
+@@ -8218,8 +8241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4112,7 +4200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8268,8 +8288,7 @@
+@@ -8268,8 +8290,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4122,7 +4210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8327,7 +8346,7 @@
+@@ -8327,7 +8348,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -4131,7 +4219,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8356,20 +8375,53 @@
+@@ -8356,20 +8377,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -4191,7 +4279,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 +8458,6 @@
+@@ -8406,9 +8460,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -4201,7 +4289,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 +8479,13 @@
+@@ -8430,6 +8481,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'"
    ;;
@@ -4215,7 +4303,7 @@
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-@@ -8437,7 +8493,7 @@
+@@ -8437,7 +8495,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -4224,7 +4312,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8455,14 +8511,17 @@
+@@ -8455,14 +8513,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -4244,7 +4332,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8624,7 +8683,7 @@
+@@ -8624,7 +8685,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -4253,7 +4341,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8644,7 +8703,7 @@
+@@ -8644,7 +8705,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -4262,7 +4350,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8929,6 +8988,17 @@
+@@ -8929,6 +8990,17 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -4280,7 +4368,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -8954,7 +9024,7 @@
+@@ -8954,7 +9026,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4289,7 +4377,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 +9086,7 @@
+@@ -9016,7 +9088,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4298,7 +4386,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 +9185,20 @@
+@@ -9115,6 +9187,20 @@
  compiler=$CC
  
  
@@ -4319,7 +4407,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -9151,11 +9235,16 @@
+@@ -9151,11 +9237,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
@@ -4337,7 +4425,7 @@
       else
         lt_prog_compiler_static_works=yes
       fi
-@@ -9201,18 +9290,20 @@
+@@ -9201,18 +9292,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 \
@@ -4346,12 +4434,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9207: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9296: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9298: $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:9300: \$? = $ac_status" >&5
++   echo "$as_me:9302: \$? = $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
@@ -4363,7 +4451,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9289,7 +9380,7 @@
+@@ -9289,7 +9382,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -4372,7 +4460,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9315,6 +9406,16 @@
+@@ -9315,6 +9408,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -4389,7 +4477,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9326,7 +9427,7 @@
+@@ -9326,7 +9429,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.
@@ -4398,7 +4486,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9350,12 +9451,19 @@
+@@ -9350,12 +9453,19 @@
        ;;
  
      linux*)
@@ -4419,7 +4507,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9376,9 +9484,14 @@
+@@ -9376,9 +9486,14 @@
        ;;
  
      solaris*)
@@ -4435,7 +4523,7 @@
        ;;
  
      sunos4*)
-@@ -9400,6 +9513,11 @@
+@@ -9400,6 +9515,11 @@
        fi
        ;;
  
@@ -4447,7 +4535,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9434,18 +9552,20 @@
+@@ -9434,18 +9554,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 \
@@ -4456,12 +4544,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9440: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9558: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9560: $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:9562: \$? = $ac_status" >&5
++   echo "$as_me:9564: \$? = $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
@@ -4473,7 +4561,7 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9466,7 +9586,7 @@
+@@ -9466,7 +9588,7 @@
  fi
  
  fi
@@ -4482,7 +4570,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9488,38 +9608,36 @@
+@@ -9488,38 +9610,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4504,12 +4592,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9507: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9620: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9622: $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:9624: \$? = $ac_status" >&5
++   echo "$as_me:9626: \$? = $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
@@ -4533,7 +4621,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9590,6 +9708,16 @@
+@@ -9590,6 +9710,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -4550,7 +4638,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9610,6 +9738,27 @@
+@@ -9610,6 +9740,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -4578,7 +4666,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9647,7 +9796,7 @@
+@@ -9647,7 +9798,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4587,7 +4675,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9657,13 +9806,13 @@
+@@ -9657,13 +9808,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'
@@ -4604,17 +4692,18 @@
  	# 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 +9821,51 @@
+@@ -9672,19 +9823,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
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -4642,12 +4731,11 @@
 +	  $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
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    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'
@@ -4660,7 +4748,7 @@
        fi
        ;;
  
-@@ -9702,8 +9883,8 @@
+@@ -9702,8 +9885,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4671,7 +4759,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9718,24 +9899,19 @@
+@@ -9718,24 +9901,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4703,7 +4791,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9769,9 +9945,20 @@
+@@ -9769,9 +9947,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
@@ -4726,7 +4814,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9788,7 +9975,7 @@
+@@ -9788,7 +9977,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -4735,7 +4823,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 +9996,9 @@
+@@ -9809,6 +9998,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -4745,7 +4833,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9817,21 +10007,22 @@
+@@ -9817,21 +10009,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4773,7 +4861,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9855,8 +10046,7 @@
+@@ -9855,8 +10048,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4783,7 +4871,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9883,14 +10073,13 @@
+@@ -9883,14 +10075,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4801,7 +4889,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9917,8 +10106,7 @@
+@@ -9917,8 +10108,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4811,7 +4899,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9955,8 +10143,8 @@
+@@ -9955,8 +10145,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
@@ -4822,7 +4910,7 @@
  	fi
        fi
        ;;
-@@ -9969,7 +10157,7 @@
+@@ -9969,7 +10159,7 @@
        ld_shlibs=no
        ;;
  
@@ -4831,7 +4919,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -9979,13 +10167,13 @@
+@@ -9979,13 +10169,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -4848,7 +4936,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 +10183,52 @@
+@@ -9995,52 +10185,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -4941,7 +5029,7 @@
      fi
        ;;
  
-@@ -10074,8 +10262,8 @@
+@@ -10074,8 +10264,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4952,7 +5040,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10083,7 +10271,7 @@
+@@ -10083,7 +10273,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -4961,7 +5049,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 +10287,16 @@
+@@ -10099,16 +10289,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4982,7 +5070,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -10118,7 +10306,7 @@
+@@ -10118,7 +10308,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -4991,7 +5079,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10151,7 +10339,7 @@
+@@ -10151,7 +10341,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5000,7 +5088,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 +10349,7 @@
+@@ -10161,7 +10351,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -5009,7 +5097,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 +10372,8 @@
+@@ -10184,7 +10374,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
@@ -5019,7 +5107,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10194,7 +10383,7 @@
+@@ -10194,7 +10385,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -5028,7 +5116,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10205,14 +10394,14 @@
+@@ -10205,14 +10396,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -5045,7 +5133,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 +10413,13 @@
+@@ -10224,13 +10415,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5061,7 +5149,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10249,10 +10438,12 @@
+@@ -10249,10 +10440,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -5076,7 +5164,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 +10452,18 @@
+@@ -10261,8 +10454,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5097,7 +5185,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10271,7 +10472,7 @@
+@@ -10271,7 +10474,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.
@@ -5106,7 +5194,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10331,9 +10532,9 @@
+@@ -10331,9 +10534,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5118,7 +5206,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10439,7 +10640,7 @@
+@@ -10439,7 +10642,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5127,7 +5215,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10449,7 +10650,20 @@
+@@ -10449,7 +10652,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5149,7 +5237,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10514,7 +10728,7 @@
+@@ -10514,7 +10730,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5158,7 +5246,7 @@
    ;;
  
  beos*)
-@@ -10523,7 +10737,7 @@
+@@ -10523,7 +10739,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -5167,7 +5255,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 +10753,7 @@
+@@ -10539,7 +10755,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5176,7 +5264,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10551,7 +10765,8 @@
+@@ -10551,7 +10767,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -5186,7 +5274,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10581,7 +10796,7 @@
+@@ -10581,7 +10798,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5195,7 +5283,7 @@
        ;;
      esac
      ;;
-@@ -10604,7 +10819,7 @@
+@@ -10604,7 +10821,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5204,7 +5292,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 +10842,7 @@
+@@ -10627,7 +10844,7 @@
    dynamic_linker=no
    ;;
  
@@ -5213,7 +5301,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10639,8 +10854,17 @@
+@@ -10639,8 +10856,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -5233,7 +5321,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10658,7 +10882,7 @@
+@@ -10658,7 +10884,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -5242,7 +5330,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10685,9 +10909,9 @@
+@@ -10685,9 +10911,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -5254,7 +5342,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10702,7 +10926,7 @@
+@@ -10702,7 +10928,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5263,7 +5351,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10713,7 +10937,7 @@
+@@ -10713,7 +10939,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5272,7 +5360,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10775,22 +10999,19 @@
+@@ -10775,22 +11001,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'
@@ -5301,7 +5389,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 +11021,30 @@
+@@ -10800,6 +11023,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5332,7 +5420,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10809,7 +11054,7 @@
+@@ -10809,7 +11056,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5341,7 +5429,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10838,7 +11083,11 @@
+@@ -10838,7 +11085,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -5354,7 +5442,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 +11107,7 @@
+@@ -10858,7 +11109,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5363,7 +5451,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10960,8 +11209,8 @@
+@@ -10960,8 +11211,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
@@ -5374,7 +5462,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11087,8 +11336,7 @@
+@@ -11087,8 +11338,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5384,7 +5472,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11191,8 +11439,7 @@
+@@ -11191,8 +11441,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5394,7 +5482,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11257,8 +11504,7 @@
+@@ -11257,8 +11506,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5404,7 +5492,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11351,8 +11597,7 @@
+@@ -11351,8 +11599,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5414,7 +5502,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11417,8 +11662,7 @@
+@@ -11417,8 +11664,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5424,7 +5512,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11484,8 +11728,7 @@
+@@ -11484,8 +11730,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5434,7 +5522,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11551,8 +11794,7 @@
+@@ -11551,8 +11796,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5444,16 +5532,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11627,7 +11869,7 @@
+@@ -11627,7 +11871,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 11872 "configure"
++#line 11874 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11693,7 +11935,7 @@
+@@ -11693,7 +11937,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5462,16 +5550,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11725,7 +11967,7 @@
+@@ -11725,7 +11969,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 11970 "configure"
++#line 11972 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11791,7 +12033,7 @@
+@@ -11791,7 +12035,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5480,7 +5568,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11841,7 +12083,7 @@
+@@ -11841,7 +12085,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -5489,7 +5577,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11850,47 +12092,10 @@
+@@ -11850,47 +12094,10 @@
    fi
    ;;
  
@@ -5538,7 +5626,7 @@
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11916,7 +12121,8 @@
+@@ -11916,7 +12123,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.
@@ -5548,7 +5636,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 +12236,11 @@
+@@ -12030,11 +12238,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5562,7 +5650,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12064,6 +12270,12 @@
+@@ -12064,6 +12272,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -5575,7 +5663,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12094,7 +12306,7 @@
+@@ -12094,7 +12308,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5584,7 +5672,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12125,7 +12337,7 @@
+@@ -12125,7 +12339,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5593,7 +5681,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12140,7 +12352,7 @@
+@@ -12140,7 +12354,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -5602,7 +5690,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12367,7 +12579,10 @@
+@@ -12367,7 +12581,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.
@@ -5614,7 +5702,7 @@
  fi
  
  
-@@ -12432,7 +12647,9 @@
+@@ -12432,7 +12649,9 @@
  
        case $tagname in
        CXX)
@@ -5625,7 +5713,7 @@
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12469,7 +12686,7 @@
+@@ -12469,7 +12688,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -5634,7 +5722,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12490,6 +12707,20 @@
+@@ -12490,6 +12709,20 @@
  compiler=$CC
  
  
@@ -5655,7 +5743,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12511,7 +12742,16 @@
+@@ -12511,7 +12744,16 @@
  CC=${CXX-"c++"}
  compiler=$CC
  compiler_CXX=$CC
@@ -5673,7 +5761,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12582,7 +12822,7 @@
+@@ -12582,7 +12824,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,
@@ -5682,7 +5770,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 +12856,7 @@
+@@ -12616,7 +12858,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -5691,7 +5779,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12635,8 +12875,8 @@
+@@ -12635,8 +12877,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
@@ -5702,7 +5790,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12662,7 +12902,7 @@
+@@ -12662,7 +12904,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.
@@ -5711,7 +5799,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12693,8 +12933,22 @@
+@@ -12693,8 +12935,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -5736,7 +5824,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12711,7 +12965,7 @@
+@@ -12711,7 +12967,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -5745,7 +5833,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 +12986,9 @@
+@@ -12732,6 +12988,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -5755,7 +5843,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12740,15 +12997,16 @@
+@@ -12740,15 +12999,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -5776,7 +5864,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 +13036,7 @@
+@@ -12778,8 +13038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5786,7 +5874,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12808,13 +13065,12 @@
+@@ -12808,13 +13067,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -5802,7 +5890,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12841,8 +13097,7 @@
+@@ -12841,8 +13099,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5812,7 +5900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12879,8 +13134,8 @@
+@@ -12879,8 +13136,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
@@ -5823,7 +5911,7 @@
        fi
      fi
      ;;
-@@ -12893,16 +13148,17 @@
+@@ -12893,16 +13150,17 @@
      esac
      ;;
  
@@ -5843,7 +5931,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 +13167,81 @@
+@@ -12911,70 +13169,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -5977,7 +6065,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -12985,14 +13252,14 @@
+@@ -12985,14 +13254,14 @@
  	;;
      esac
      ;;
@@ -5994,7 +6082,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13009,12 +13276,12 @@
+@@ -13009,12 +13278,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -6010,7 +6098,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 +13290,11 @@
+@@ -13023,11 +13292,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.
@@ -6024,7 +6112,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13037,7 +13304,7 @@
+@@ -13037,7 +13306,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -6033,7 +6121,7 @@
        hppa*64*)
  	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
  	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13053,7 +13320,7 @@
+@@ -13053,7 +13322,7 @@
          ;;
        esac
      fi
@@ -6042,7 +6130,7 @@
      hppa*64*)
        hardcode_direct_CXX=no
        hardcode_shlibpath_var_CXX=no
-@@ -13074,17 +13341,17 @@
+@@ -13074,17 +13343,17 @@
      esac
  
      case $cc_basename in
@@ -6064,7 +6152,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13100,12 +13367,12 @@
+@@ -13100,12 +13369,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -6079,7 +6167,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13118,9 +13385,9 @@
+@@ -13118,9 +13387,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -6091,7 +6179,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13131,9 +13398,9 @@
+@@ -13131,9 +13400,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -6103,7 +6191,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13144,14 +13411,14 @@
+@@ -13144,14 +13413,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -6121,7 +6209,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 +13436,44 @@
+@@ -13169,20 +13438,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -6172,7 +6260,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13210,7 +13501,7 @@
+@@ -13210,7 +13503,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -6181,7 +6269,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13220,7 +13511,7 @@
+@@ -13220,7 +13513,7 @@
  	;;
      esac
      ;;
@@ -6190,7 +6278,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 +13522,31 @@
+@@ -13231,15 +13524,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::"'
      ;;
@@ -6224,7 +6312,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13249,14 +13556,14 @@
+@@ -13249,14 +13558,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -6242,7 +6330,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13274,7 +13581,7 @@
+@@ -13274,7 +13583,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6251,7 +6339,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13293,13 +13600,13 @@
+@@ -13293,13 +13602,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -6267,7 +6355,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13308,17 +13615,17 @@
+@@ -13308,17 +13617,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -6289,7 +6377,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13337,7 +13644,7 @@
+@@ -13337,7 +13646,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6298,7 +6386,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13361,7 +13668,7 @@
+@@ -13361,7 +13670,7 @@
    sco*)
      archive_cmds_need_lc_CXX=no
      case $cc_basename in
@@ -6307,7 +6395,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13373,12 +13680,12 @@
+@@ -13373,12 +13682,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -6322,7 +6410,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13391,36 +13698,33 @@
+@@ -13391,36 +13700,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -6371,7 +6459,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13428,9 +13732,9 @@
+@@ -13428,9 +13734,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -6383,7 +6471,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13440,9 +13744,9 @@
+@@ -13440,9 +13746,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
@@ -6395,7 +6483,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13451,9 +13755,9 @@
+@@ -13451,9 +13757,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -6407,7 +6495,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13471,7 +13775,7 @@
+@@ -13471,7 +13777,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -6416,7 +6504,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13528,7 +13832,7 @@
+@@ -13528,7 +13834,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.
@@ -6425,7 +6513,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13568,7 +13872,7 @@
+@@ -13568,7 +13874,7 @@
         fi
         ;;
  
@@ -6434,7 +6522,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13604,6 +13908,20 @@
+@@ -13604,6 +13910,20 @@
  
  $rm -f confest.$objext
  
@@ -6455,7 +6543,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13659,7 +13977,7 @@
+@@ -13659,7 +13979,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -6464,7 +6552,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13684,18 +14002,28 @@
+@@ -13684,18 +14004,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -6496,7 +6584,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13703,22 +14031,22 @@
+@@ -13703,22 +14033,22 @@
  	    ;;
  	esac
  	;;
@@ -6523,7 +6611,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13733,7 +14061,7 @@
+@@ -13733,7 +14063,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -6532,7 +6620,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13744,18 +14072,24 @@
+@@ -13744,18 +14074,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -6560,7 +6648,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 +14106,25 @@
+@@ -13772,25 +14108,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -6591,7 +6679,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13806,7 +14140,7 @@
+@@ -13806,7 +14142,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -6600,7 +6688,7 @@
  	    lt_prog_compiler_pic_CXX='-fPIC'
  	    ;;
  	  *)
-@@ -13815,13 +14149,13 @@
+@@ -13815,13 +14151,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -6616,7 +6704,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13831,12 +14165,12 @@
+@@ -13831,12 +14167,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -6631,7 +6719,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13846,7 +14180,7 @@
+@@ -13846,7 +14182,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -6640,7 +6728,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13887,18 +14221,20 @@
+@@ -13887,18 +14223,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 \
@@ -6649,12 +6737,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:13893: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14227: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14229: $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:14231: \$? = $ac_status" >&5
++   echo "$as_me:14233: \$? = $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
@@ -6666,7 +6754,7 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -13919,7 +14255,7 @@
+@@ -13919,7 +14257,7 @@
  fi
  
  fi
@@ -6675,7 +6763,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -13941,38 +14277,36 @@
+@@ -13941,38 +14279,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6697,12 +6785,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:13960: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14289: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14291: $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:14293: \$? = $ac_status" >&5
++   echo "$as_me:14295: \$? = $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
@@ -6726,7 +6814,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14022,7 +14356,10 @@
+@@ -14022,7 +14358,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -6738,7 +6826,7 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14105,7 +14442,7 @@
+@@ -14105,7 +14444,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6747,7 +6835,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14115,7 +14452,20 @@
+@@ -14115,7 +14454,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6769,7 +6857,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14180,7 +14530,7 @@
+@@ -14180,7 +14532,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6778,7 +6866,7 @@
    ;;
  
  beos*)
-@@ -14189,7 +14539,7 @@
+@@ -14189,7 +14541,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -6787,7 +6875,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 +14555,7 @@
+@@ -14205,7 +14557,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -6796,7 +6884,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14217,7 +14567,8 @@
+@@ -14217,7 +14569,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -6806,7 +6894,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14247,7 +14598,7 @@
+@@ -14247,7 +14600,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6815,7 +6903,7 @@
        ;;
      esac
      ;;
-@@ -14270,7 +14621,7 @@
+@@ -14270,7 +14623,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -6824,7 +6912,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 +14644,7 @@
+@@ -14293,7 +14646,7 @@
    dynamic_linker=no
    ;;
  
@@ -6833,7 +6921,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14305,8 +14656,17 @@
+@@ -14305,8 +14658,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -6853,7 +6941,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14324,7 +14684,7 @@
+@@ -14324,7 +14686,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -6862,7 +6950,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14351,9 +14711,9 @@
+@@ -14351,9 +14713,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -6874,7 +6962,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14368,7 +14728,7 @@
+@@ -14368,7 +14730,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6883,7 +6971,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14379,7 +14739,7 @@
+@@ -14379,7 +14741,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6892,7 +6980,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14441,22 +14801,19 @@
+@@ -14441,22 +14803,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'
@@ -6921,7 +7009,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 +14823,30 @@
+@@ -14466,6 +14825,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6952,7 +7040,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14475,7 +14856,7 @@
+@@ -14475,7 +14858,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6961,7 +7049,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14504,7 +14885,11 @@
+@@ -14504,7 +14887,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -6974,7 +7062,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 +14909,7 @@
+@@ -14524,7 +14911,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6983,7 +7071,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14626,8 +15011,8 @@
+@@ -14626,8 +15013,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" || \
@@ -6994,7 +7082,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14753,8 +15138,7 @@
+@@ -14753,8 +15140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7004,7 +7092,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14857,8 +15241,7 @@
+@@ -14857,8 +15243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7014,7 +7102,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14923,8 +15306,7 @@
+@@ -14923,8 +15308,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7024,7 +7112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15017,8 +15399,7 @@
+@@ -15017,8 +15401,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7034,7 +7122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15083,8 +15464,7 @@
+@@ -15083,8 +15466,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7044,7 +7132,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15150,8 +15530,7 @@
+@@ -15150,8 +15532,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7054,7 +7142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15217,8 +15596,7 @@
+@@ -15217,8 +15598,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7064,16 +7152,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15293,7 +15671,7 @@
+@@ -15293,7 +15673,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 15674 "configure"
++#line 15676 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15359,7 +15737,7 @@
+@@ -15359,7 +15739,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7082,16 +7170,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15391,7 +15769,7 @@
+@@ -15391,7 +15771,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 15772 "configure"
++#line 15774 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15457,7 +15835,7 @@
+@@ -15457,7 +15837,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7100,7 +7188,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15508,7 +15886,8 @@
+@@ -15508,7 +15888,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.
@@ -7110,7 +7198,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 +15987,12 @@
+@@ -15608,6 +15989,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -7123,7 +7211,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -15638,7 +16023,7 @@
+@@ -15638,7 +16025,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7132,7 +7220,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15669,7 +16054,7 @@
+@@ -15669,7 +16056,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7141,7 +7229,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15684,7 +16069,7 @@
+@@ -15684,7 +16071,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -7150,7 +7238,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -15886,7 +16271,10 @@
+@@ -15886,7 +16273,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.
@@ -7162,7 +7250,7 @@
  fi
  
  
-@@ -15962,12 +16350,35 @@
+@@ -15962,12 +16352,35 @@
  compiler=$CC
  
  
@@ -7199,7 +7287,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 +16391,7 @@
+@@ -15980,7 +16393,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -7208,7 +7296,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -15988,8 +16399,10 @@
+@@ -15988,8 +16401,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -7221,7 +7309,7 @@
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16066,7 +16479,7 @@
+@@ -16066,7 +16481,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -7230,7 +7318,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16092,6 +16505,16 @@
+@@ -16092,6 +16507,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -7247,7 +7335,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16103,7 +16526,7 @@
+@@ -16103,7 +16528,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.
@@ -7256,7 +7344,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16127,12 +16550,19 @@
+@@ -16127,12 +16552,19 @@
        ;;
  
      linux*)
@@ -7277,7 +7365,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16153,9 +16583,14 @@
+@@ -16153,9 +16585,14 @@
        ;;
  
      solaris*)
@@ -7293,7 +7381,7 @@
        ;;
  
      sunos4*)
-@@ -16177,6 +16612,11 @@
+@@ -16177,6 +16614,11 @@
        fi
        ;;
  
@@ -7305,7 +7393,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16211,18 +16651,20 @@
+@@ -16211,18 +16653,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 \
@@ -7314,12 +7402,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16217: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16657: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16659: $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:16661: \$? = $ac_status" >&5
++   echo "$as_me:16663: \$? = $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
@@ -7331,7 +7419,7 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16243,7 +16685,7 @@
+@@ -16243,7 +16687,7 @@
  fi
  
  fi
@@ -7340,7 +7428,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16265,38 +16707,36 @@
+@@ -16265,38 +16709,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7362,12 +7450,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16284: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16719: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16721: $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:16723: \$? = $ac_status" >&5
++   echo "$as_me:16725: \$? = $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
@@ -7391,7 +7479,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16367,6 +16807,16 @@
+@@ -16367,6 +16809,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -7408,7 +7496,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16387,6 +16837,27 @@
+@@ -16387,6 +16839,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -7436,7 +7524,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16424,7 +16895,7 @@
+@@ -16424,7 +16897,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -7445,7 +7533,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16434,13 +16905,13 @@
+@@ -16434,13 +16907,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'
@@ -7462,7 +7550,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 +16920,51 @@
+@@ -16449,19 +16922,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -7519,7 +7607,7 @@
        fi
        ;;
  
-@@ -16479,8 +16982,8 @@
+@@ -16479,8 +16984,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7530,7 +7618,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16495,24 +16998,19 @@
+@@ -16495,24 +17000,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7562,7 +7650,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16546,9 +17044,20 @@
+@@ -16546,9 +17046,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
@@ -7585,7 +7673,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16565,7 +17074,7 @@
+@@ -16565,7 +17076,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -7594,7 +7682,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 +17095,9 @@
+@@ -16586,6 +17097,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -7604,7 +7692,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16594,21 +17106,22 @@
+@@ -16594,21 +17108,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -7632,7 +7720,7 @@
        program main
  
        end
-@@ -16622,8 +17135,7 @@
+@@ -16622,8 +17137,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7642,7 +7730,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16650,14 +17162,13 @@
+@@ -16650,14 +17164,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -7660,7 +7748,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16674,8 +17185,7 @@
+@@ -16674,8 +17187,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7670,7 +7758,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16712,8 +17222,8 @@
+@@ -16712,8 +17224,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
@@ -7681,7 +7769,7 @@
  	fi
        fi
        ;;
-@@ -16726,7 +17236,7 @@
+@@ -16726,7 +17238,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -7690,7 +7778,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16736,68 +17246,68 @@
+@@ -16736,68 +17248,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -7803,7 +7891,7 @@
      fi
        ;;
  
-@@ -16831,8 +17341,8 @@
+@@ -16831,8 +17343,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7814,7 +7902,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16840,7 +17350,7 @@
+@@ -16840,7 +17352,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -7823,7 +7911,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 +17366,16 @@
+@@ -16856,16 +17368,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7844,7 +7932,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -16875,7 +17385,7 @@
+@@ -16875,7 +17387,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -7853,7 +7941,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16908,7 +17418,7 @@
+@@ -16908,7 +17420,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -7862,7 +7950,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 +17428,7 @@
+@@ -16918,7 +17430,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -7871,7 +7959,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 +17451,8 @@
+@@ -16941,7 +17453,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
@@ -7881,7 +7969,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16951,7 +17462,7 @@
+@@ -16951,7 +17464,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -7890,7 +7978,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16962,14 +17473,14 @@
+@@ -16962,14 +17475,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -7907,7 +7995,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 +17492,13 @@
+@@ -16981,13 +17494,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7923,7 +8011,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17006,10 +17517,12 @@
+@@ -17006,10 +17519,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -7938,7 +8026,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 +17531,18 @@
+@@ -17018,8 +17533,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7959,7 +8047,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17028,7 +17551,7 @@
+@@ -17028,7 +17553,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.
@@ -7968,7 +8056,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17088,9 +17611,9 @@
+@@ -17088,9 +17613,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -7980,7 +8068,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17196,7 +17719,7 @@
+@@ -17196,7 +17721,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -7989,7 +8077,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17206,7 +17729,20 @@
+@@ -17206,7 +17731,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8011,7 +8099,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17271,7 +17807,7 @@
+@@ -17271,7 +17809,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8020,7 +8108,7 @@
    ;;
  
  beos*)
-@@ -17280,7 +17816,7 @@
+@@ -17280,7 +17818,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8029,7 +8117,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 +17832,7 @@
+@@ -17296,7 +17834,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8038,7 +8126,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17308,7 +17844,8 @@
+@@ -17308,7 +17846,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8048,7 +8136,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17338,7 +17875,7 @@
+@@ -17338,7 +17877,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8057,7 +8145,7 @@
        ;;
      esac
      ;;
-@@ -17361,7 +17898,7 @@
+@@ -17361,7 +17900,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8066,7 +8154,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 +17921,7 @@
+@@ -17384,7 +17923,7 @@
    dynamic_linker=no
    ;;
  
@@ -8075,7 +8163,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17396,8 +17933,17 @@
+@@ -17396,8 +17935,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -8095,7 +8183,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17415,7 +17961,7 @@
+@@ -17415,7 +17963,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8104,7 +8192,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17442,9 +17988,9 @@
+@@ -17442,9 +17990,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8116,7 +8204,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17459,7 +18005,7 @@
+@@ -17459,7 +18007,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8125,7 +8213,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17470,7 +18016,7 @@
+@@ -17470,7 +18018,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8134,7 +8222,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17532,22 +18078,19 @@
+@@ -17532,22 +18080,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'
@@ -8163,7 +8251,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 +18100,30 @@
+@@ -17557,6 +18102,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8194,7 +8282,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17566,7 +18133,7 @@
+@@ -17566,7 +18135,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8203,7 +8291,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17595,7 +18162,11 @@
+@@ -17595,7 +18164,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -8216,7 +8304,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 +18186,7 @@
+@@ -17615,7 +18188,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8225,7 +8313,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17717,8 +18288,8 @@
+@@ -17717,8 +18290,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" || \
@@ -8236,7 +8324,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17794,7 +18365,8 @@
+@@ -17794,7 +18367,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.
@@ -8246,7 +8334,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 +18466,12 @@
+@@ -17894,6 +18468,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -8259,7 +8347,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17924,7 +18502,7 @@
+@@ -17924,7 +18504,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8268,7 +8356,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17955,7 +18533,7 @@
+@@ -17955,7 +18535,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8277,7 +8365,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -17970,7 +18548,7 @@
+@@ -17970,7 +18550,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -8286,7 +8374,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18172,7 +18750,10 @@
+@@ -18172,7 +18752,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.
@@ -8298,7 +8386,7 @@
  fi
  
  
-@@ -18205,7 +18786,7 @@
+@@ -18205,7 +18788,7 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -8307,7 +8395,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18216,15 +18797,41 @@
+@@ -18216,15 +18799,41 @@
  compiler=$CC
  
  
@@ -8349,7 +8437,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 +18858,20 @@
+@@ -18251,18 +18860,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 \
@@ -8358,12 +8446,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18257: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18864: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18866: $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:18868: \$? = $ac_status" >&5
++   echo "$as_me:18870: \$? = $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
@@ -8375,7 +8463,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18339,7 +18948,7 @@
+@@ -18339,7 +18950,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -8384,7 +8472,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18365,6 +18974,16 @@
+@@ -18365,6 +18976,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -8401,7 +8489,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18376,7 +18995,7 @@
+@@ -18376,7 +18997,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.
@@ -8410,7 +8498,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18400,12 +19019,19 @@
+@@ -18400,12 +19021,19 @@
        ;;
  
      linux*)
@@ -8431,7 +8519,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18426,9 +19052,14 @@
+@@ -18426,9 +19054,14 @@
        ;;
  
      solaris*)
@@ -8447,7 +8535,7 @@
        ;;
  
      sunos4*)
-@@ -18450,6 +19081,11 @@
+@@ -18450,6 +19083,11 @@
        fi
        ;;
  
@@ -8459,7 +8547,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18484,18 +19120,20 @@
+@@ -18484,18 +19122,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 \
@@ -8468,12 +8556,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18490: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19126: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19128: $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:19130: \$? = $ac_status" >&5
++   echo "$as_me:19132: \$? = $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
@@ -8485,7 +8573,7 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18516,7 +19154,7 @@
+@@ -18516,7 +19156,7 @@
  fi
  
  fi
@@ -8494,7 +8582,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18538,38 +19176,36 @@
+@@ -18538,38 +19178,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -8516,12 +8604,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18557: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19188: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19190: $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:19192: \$? = $ac_status" >&5
++   echo "$as_me:19194: \$? = $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
@@ -8545,7 +8633,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18640,6 +19276,16 @@
+@@ -18640,6 +19278,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -8562,7 +8650,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18660,6 +19306,27 @@
+@@ -18660,6 +19308,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -8590,7 +8678,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18697,7 +19364,7 @@
+@@ -18697,7 +19366,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -8599,7 +8687,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18707,13 +19374,13 @@
+@@ -18707,13 +19376,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'
@@ -8616,7 +8704,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 +19389,51 @@
+@@ -18722,19 +19391,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -8673,7 +8761,7 @@
        fi
        ;;
  
-@@ -18752,8 +19451,8 @@
+@@ -18752,8 +19453,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8684,7 +8772,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18768,24 +19467,19 @@
+@@ -18768,24 +19469,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8716,7 +8804,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18819,9 +19513,20 @@
+@@ -18819,9 +19515,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
@@ -8739,7 +8827,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18838,7 +19543,7 @@
+@@ -18838,7 +19545,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -8748,7 +8836,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 +19564,9 @@
+@@ -18859,6 +19566,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -8758,7 +8846,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18867,21 +19575,22 @@
+@@ -18867,21 +19577,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -8786,7 +8874,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18905,8 +19614,7 @@
+@@ -18905,8 +19616,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8796,7 +8884,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18933,14 +19641,13 @@
+@@ -18933,14 +19643,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -8814,7 +8902,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18967,8 +19674,7 @@
+@@ -18967,8 +19676,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8824,7 +8912,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19005,8 +19711,8 @@
+@@ -19005,8 +19713,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
@@ -8835,7 +8923,7 @@
  	fi
        fi
        ;;
-@@ -19019,7 +19725,7 @@
+@@ -19019,7 +19727,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -8844,7 +8932,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19029,68 +19735,68 @@
+@@ -19029,68 +19737,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -8957,7 +9045,7 @@
      fi
        ;;
  
-@@ -19124,8 +19830,8 @@
+@@ -19124,8 +19832,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8968,7 +9056,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19133,7 +19839,7 @@
+@@ -19133,7 +19841,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8977,7 +9065,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 +19855,16 @@
+@@ -19149,16 +19857,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8998,7 +9086,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -19168,7 +19874,7 @@
+@@ -19168,7 +19876,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -9007,7 +9095,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19201,7 +19907,7 @@
+@@ -19201,7 +19909,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -9016,7 +9104,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 +19917,7 @@
+@@ -19211,7 +19919,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -9025,7 +9113,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 +19940,8 @@
+@@ -19234,7 +19942,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
@@ -9035,7 +9123,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19244,7 +19951,7 @@
+@@ -19244,7 +19953,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -9044,7 +9132,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19255,14 +19962,14 @@
+@@ -19255,14 +19964,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -9061,7 +9149,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 +19981,13 @@
+@@ -19274,13 +19983,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9077,7 +9165,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19299,10 +20006,12 @@
+@@ -19299,10 +20008,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -9092,7 +9180,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 +20020,18 @@
+@@ -19311,8 +20022,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9113,7 +9201,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19321,7 +20040,7 @@
+@@ -19321,7 +20042,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.
@@ -9122,7 +9210,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19381,9 +20100,9 @@
+@@ -19381,9 +20102,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -9134,7 +9222,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19489,7 +20208,7 @@
+@@ -19489,7 +20210,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -9143,7 +9231,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19499,7 +20218,20 @@
+@@ -19499,7 +20220,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9165,7 +9253,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19564,7 +20296,7 @@
+@@ -19564,7 +20298,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9174,7 +9262,7 @@
    ;;
  
  beos*)
-@@ -19573,7 +20305,7 @@
+@@ -19573,7 +20307,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -9183,7 +9271,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 +20321,7 @@
+@@ -19589,7 +20323,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9192,7 +9280,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19601,7 +20333,8 @@
+@@ -19601,7 +20335,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -9202,7 +9290,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19631,7 +20364,7 @@
+@@ -19631,7 +20366,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9211,7 +9299,7 @@
        ;;
      esac
      ;;
-@@ -19654,7 +20387,7 @@
+@@ -19654,7 +20389,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9220,7 +9308,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 +20410,7 @@
+@@ -19677,7 +20412,7 @@
    dynamic_linker=no
    ;;
  
@@ -9229,7 +9317,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19689,8 +20422,17 @@
+@@ -19689,8 +20424,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -9249,7 +9337,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19708,7 +20450,7 @@
+@@ -19708,7 +20452,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -9258,7 +9346,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19735,9 +20477,9 @@
+@@ -19735,9 +20479,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -9270,7 +9358,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19752,7 +20494,7 @@
+@@ -19752,7 +20496,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9279,7 +9367,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19763,7 +20505,7 @@
+@@ -19763,7 +20507,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9288,7 +9376,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19825,22 +20567,19 @@
+@@ -19825,22 +20569,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'
@@ -9317,7 +9405,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 +20589,30 @@
+@@ -19850,6 +20591,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9348,7 +9436,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19859,7 +20622,7 @@
+@@ -19859,7 +20624,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -9357,7 +9445,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19888,7 +20651,11 @@
+@@ -19888,7 +20653,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -9370,7 +9458,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 +20675,7 @@
+@@ -19908,7 +20677,7 @@
  
  os2*)
    libname_spec='$name'
@@ -9379,7 +9467,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20010,8 +20777,8 @@
+@@ -20010,8 +20779,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" || \
@@ -9390,7 +9478,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_GCJ" != no &&
-@@ -20137,8 +20904,7 @@
+@@ -20137,8 +20906,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9400,7 +9488,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20241,8 +21007,7 @@
+@@ -20241,8 +21009,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9410,7 +9498,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20307,8 +21072,7 @@
+@@ -20307,8 +21074,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9420,7 +9508,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20401,8 +21165,7 @@
+@@ -20401,8 +21167,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9430,7 +9518,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20467,8 +21230,7 @@
+@@ -20467,8 +21232,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9440,7 +9528,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20534,8 +21296,7 @@
+@@ -20534,8 +21298,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9450,7 +9538,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20601,8 +21362,7 @@
+@@ -20601,8 +21364,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9460,16 +9548,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20677,7 +21437,7 @@
+@@ -20677,7 +21439,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 21440 "configure"
++#line 21442 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20743,7 +21503,7 @@
+@@ -20743,7 +21505,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9478,16 +9566,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20775,7 +21535,7 @@
+@@ -20775,7 +21537,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 21538 "configure"
++#line 21540 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20841,7 +21601,7 @@
+@@ -20841,7 +21603,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9496,7 +9584,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20892,7 +21652,8 @@
+@@ -20892,7 +21654,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.
@@ -9506,7 +9594,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 +21753,12 @@
+@@ -20992,6 +21755,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9519,7 +9607,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21022,7 +21789,7 @@
+@@ -21022,7 +21791,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9528,7 +9616,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21053,7 +21820,7 @@
+@@ -21053,7 +21822,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9537,7 +9625,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21068,7 +21835,7 @@
+@@ -21068,7 +21837,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -9546,7 +9634,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21270,7 +22037,10 @@
+@@ -21270,7 +22039,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.
@@ -9558,7 +9646,7 @@
  fi
  
  
-@@ -21313,11 +22083,35 @@
+@@ -21313,11 +22085,35 @@
  compiler=$CC
  
  
@@ -9594,7 +9682,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21333,7 +22127,8 @@
+@@ -21333,7 +22129,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.
@@ -9604,7 +9692,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 +22228,12 @@
+@@ -21433,6 +22230,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9617,7 +9705,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21463,7 +22264,7 @@
+@@ -21463,7 +22266,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9626,7 +9714,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21494,7 +22295,7 @@
+@@ -21494,7 +22297,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9635,7 +9723,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21509,7 +22310,7 @@
+@@ -21509,7 +22312,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -9644,7 +9732,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21711,7 +22512,10 @@
+@@ -21711,7 +22514,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.
@@ -9656,7 +9744,7 @@
  fi
  
  
-@@ -21758,7 +22562,7 @@
+@@ -21758,7 +22564,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -9665,7 +9753,7 @@
  
  # Prevent multiple expansion
  
-@@ -21999,8 +22803,7 @@
+@@ -21999,8 +22805,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9675,7 +9763,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22074,9 +22877,6 @@
+@@ -22074,9 +22879,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9685,7 +9773,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22110,8 +22910,7 @@
+@@ -22110,8 +22912,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9695,7 +9783,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22215,8 +23014,7 @@
+@@ -22215,8 +23016,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9705,7 +9793,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22295,9 +23093,6 @@
+@@ -22295,9 +23095,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9715,7 +9803,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22330,8 +23125,7 @@
+@@ -22330,8 +23127,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9725,7 +9813,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22434,8 +23228,7 @@
+@@ -22434,8 +23230,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9735,7 +9823,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22525,8 +23318,7 @@
+@@ -22525,8 +23320,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9745,7 +9833,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22587,8 +23379,7 @@
+@@ -22587,8 +23381,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9755,7 +9843,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22656,8 +23447,7 @@
+@@ -22656,8 +23449,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9765,7 +9853,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22723,8 +23513,7 @@
+@@ -22723,8 +23515,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9775,7 +9863,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22817,8 +23606,7 @@
+@@ -22817,8 +23608,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9785,7 +9873,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22896,8 +23684,7 @@
+@@ -22896,8 +23686,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9795,7 +9883,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22981,8 +23768,7 @@
+@@ -22981,8 +23770,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9805,7 +9893,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23050,8 +23836,7 @@
+@@ -23050,8 +23838,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9815,7 +9903,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23146,8 +23931,7 @@
+@@ -23146,8 +23933,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9825,7 +9913,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23211,8 +23995,7 @@
+@@ -23211,8 +23997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9835,7 +9923,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23307,8 +24090,7 @@
+@@ -23307,8 +24092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9845,7 +9933,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23372,8 +24154,7 @@
+@@ -23372,8 +24156,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9855,7 +9943,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23469,8 +24250,7 @@
+@@ -23469,8 +24252,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9865,7 +9953,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23534,8 +24314,7 @@
+@@ -23534,8 +24316,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9875,7 +9963,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23632,8 +24411,7 @@
+@@ -23632,8 +24413,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9885,7 +9973,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23698,8 +24476,7 @@
+@@ -23698,8 +24478,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9895,7 +9983,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23767,8 +24544,7 @@
+@@ -23767,8 +24546,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9905,7 +9993,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23919,8 +24695,7 @@
+@@ -23919,8 +24697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9915,7 +10003,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24075,8 +24850,7 @@
+@@ -24075,8 +24852,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9925,7 +10013,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24141,8 +24915,7 @@
+@@ -24141,8 +24917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9935,7 +10023,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24289,8 +25062,7 @@
+@@ -24289,8 +25064,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9945,7 +10033,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24445,8 +25217,7 @@
+@@ -24445,8 +25219,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9955,7 +10043,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24502,9 +25273,6 @@
+@@ -24502,9 +25275,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9965,7 +10053,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24538,8 +25306,7 @@
+@@ -24538,8 +25308,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9975,7 +10063,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24643,8 +25410,7 @@
+@@ -24643,8 +25412,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9985,7 +10073,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24744,8 +25510,7 @@
+@@ -24744,8 +25512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9995,7 +10083,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24819,8 +25584,7 @@
+@@ -24819,8 +25586,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10005,7 +10093,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24883,8 +25647,7 @@
+@@ -24883,8 +25649,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10015,7 +10103,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24946,8 +25709,7 @@
+@@ -24946,8 +25711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10025,7 +10113,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24987,8 +25749,7 @@
+@@ -24987,8 +25751,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10035,7 +10123,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25044,8 +25805,7 @@
+@@ -25044,8 +25807,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10045,7 +10133,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25085,8 +25845,7 @@
+@@ -25085,8 +25847,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10055,7 +10143,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25150,8 +25909,7 @@
+@@ -25150,8 +25911,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10065,7 +10153,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25182,10 +25940,8 @@
+@@ -25182,10 +25942,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10078,7 +10166,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25296,8 +26052,7 @@
+@@ -25296,8 +26054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10088,7 +10176,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25359,8 +26114,7 @@
+@@ -25359,8 +26116,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10098,7 +10186,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25400,8 +26154,7 @@
+@@ -25400,8 +26156,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10108,7 +10196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25457,8 +26210,7 @@
+@@ -25457,8 +26212,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10118,7 +10206,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25498,8 +26250,7 @@
+@@ -25498,8 +26252,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10128,7 +10216,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25563,8 +26314,7 @@
+@@ -25563,8 +26316,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10138,7 +10226,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25595,10 +26345,8 @@
+@@ -25595,10 +26347,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10151,7 +10239,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25709,8 +26457,7 @@
+@@ -25709,8 +26459,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10161,7 +10249,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25772,8 +26519,7 @@
+@@ -25772,8 +26521,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10171,7 +10259,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25813,8 +26559,7 @@
+@@ -25813,8 +26561,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10181,7 +10269,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25870,8 +26615,7 @@
+@@ -25870,8 +26617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10191,7 +10279,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25911,8 +26655,7 @@
+@@ -25911,8 +26657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10201,7 +10289,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25976,8 +26719,7 @@
+@@ -25976,8 +26721,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10211,7 +10299,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26008,10 +26750,8 @@
+@@ -26008,10 +26752,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10224,7 +10312,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26122,8 +26862,7 @@
+@@ -26122,8 +26864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10234,7 +10322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26185,8 +26924,7 @@
+@@ -26185,8 +26926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10244,7 +10332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26226,8 +26964,7 @@
+@@ -26226,8 +26966,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10254,7 +10342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26283,8 +27020,7 @@
+@@ -26283,8 +27022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10264,7 +10352,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26324,8 +27060,7 @@
+@@ -26324,8 +27062,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10274,7 +10362,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26389,8 +27124,7 @@
+@@ -26389,8 +27126,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10284,7 +10372,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26421,10 +27155,8 @@
+@@ -26421,10 +27157,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10297,7 +10385,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26543,8 +27275,7 @@
+@@ -26543,8 +27277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10307,7 +10395,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26615,8 +27346,7 @@
+@@ -26615,8 +27348,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10317,7 +10405,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26686,8 +27416,7 @@
+@@ -26686,8 +27418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10327,7 +10415,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26749,8 +27478,7 @@
+@@ -26749,8 +27480,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10337,7 +10425,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26790,8 +27518,7 @@
+@@ -26790,8 +27520,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10347,7 +10435,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26847,8 +27574,7 @@
+@@ -26847,8 +27576,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10357,7 +10445,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26888,8 +27614,7 @@
+@@ -26888,8 +27616,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10367,7 +10455,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26953,8 +27678,7 @@
+@@ -26953,8 +27680,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10377,7 +10465,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26985,10 +27709,8 @@
+@@ -26985,10 +27711,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10390,7 +10478,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27100,8 +27822,7 @@
+@@ -27100,8 +27824,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10400,7 +10488,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27163,8 +27884,7 @@
+@@ -27163,8 +27886,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10410,7 +10498,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27204,8 +27924,7 @@
+@@ -27204,8 +27926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10420,7 +10508,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27261,8 +27980,7 @@
+@@ -27261,8 +27982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10430,7 +10518,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27302,8 +28020,7 @@
+@@ -27302,8 +28022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10440,7 +10528,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27367,8 +28084,7 @@
+@@ -27367,8 +28086,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10450,7 +10538,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27399,10 +28115,8 @@
+@@ -27399,10 +28117,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10463,7 +10551,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27513,8 +28227,7 @@
+@@ -27513,8 +28229,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10473,7 +10561,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27595,8 +28308,7 @@
+@@ -27595,8 +28310,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10483,7 +10571,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27696,8 +28408,7 @@
+@@ -27696,8 +28410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10493,7 +10581,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27877,8 +28588,7 @@
+@@ -27877,8 +28590,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10503,7 +10591,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27987,8 +28697,7 @@
+@@ -27987,8 +28699,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10513,7 +10601,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28212,8 +28921,7 @@
+@@ -28212,8 +28923,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10523,7 +10611,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28436,8 +29144,7 @@
+@@ -28436,8 +29146,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10533,7 +10621,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28513,8 +29220,7 @@
+@@ -28513,8 +29222,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10543,7 +10631,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28740,8 +29446,7 @@
+@@ -28740,8 +29448,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10553,7 +10641,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28816,8 +29521,7 @@
+@@ -28816,8 +29523,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10563,7 +10651,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28877,8 +29581,7 @@
+@@ -28877,8 +29583,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10573,7 +10661,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28961,8 +29664,7 @@
+@@ -28961,8 +29666,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10583,7 +10671,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29055,8 +29757,7 @@
+@@ -29055,8 +29759,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10593,7 +10681,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29230,8 +29931,7 @@
+@@ -29230,8 +29933,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10603,7 +10691,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29329,8 +30029,7 @@
+@@ -29329,8 +30031,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10613,7 +10701,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29417,8 +30116,7 @@
+@@ -29417,8 +30118,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10623,7 +10711,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29495,8 +30193,7 @@
+@@ -29495,8 +30195,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10633,25 +10721,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29549,7 +30246,7 @@
+@@ -29549,7 +30248,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29552: $i/$j" >&5
-+    echo "configure: 30249: $i/$j" >&5
++    echo "configure: 30251: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29847,7 +30544,7 @@
+@@ -29847,7 +30546,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 29850: $i/$j" >&5
-+    echo "configure: 30547: $i/$j" >&5
++    echo "configure: 30549: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30524,8 +31221,7 @@
+@@ -30524,8 +31223,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10661,43 +10749,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30684,7 +31380,7 @@
+@@ -30684,7 +31382,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30687: $i/$j" >&5
-+    echo "configure: 31383: $i/$j" >&5
++    echo "configure: 31385: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30714,7 +31410,7 @@
+@@ -30714,7 +31412,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30717: $i/$j" >&5
-+    echo "configure: 31413: $i/$j" >&5
++    echo "configure: 31415: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30732,7 +31428,7 @@
+@@ -30732,7 +31430,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30735: $i/$j" >&5
-+    echo "configure: 31431: $i/$j" >&5
++    echo "configure: 31433: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32255,7 +32951,7 @@
+@@ -32255,7 +32953,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32258: $i/$j" >&5
-+    echo "configure: 32954: $i/$j" >&5
++    echo "configure: 32956: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32514,8 +33210,7 @@
+@@ -32514,8 +33212,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10707,7 +10795,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32610,8 +33305,7 @@
+@@ -32610,8 +33307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10717,7 +10805,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32704,8 +33398,7 @@
+@@ -32704,8 +33400,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10727,7 +10815,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32827,8 +33520,7 @@
+@@ -32827,8 +33522,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10737,7 +10825,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32885,8 +33577,7 @@
+@@ -32885,8 +33579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10747,7 +10835,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33025,8 +33716,7 @@
+@@ -33025,8 +33718,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10757,7 +10845,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33266,8 +33956,7 @@
+@@ -33266,8 +33958,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10767,7 +10855,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33335,8 +34024,7 @@
+@@ -33335,8 +34026,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10777,7 +10865,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33431,8 +34119,7 @@
+@@ -33431,8 +34121,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10787,7 +10875,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33675,8 +34362,7 @@
+@@ -33675,8 +34364,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10797,7 +10885,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33748,8 +34434,7 @@
+@@ -33748,8 +34436,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10807,7 +10895,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33803,8 +34488,7 @@
+@@ -33803,8 +34490,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10817,7 +10905,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33875,8 +34559,7 @@
+@@ -33875,8 +34561,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10827,7 +10915,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33930,8 +34613,7 @@
+@@ -33930,8 +34615,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10837,7 +10925,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33998,8 +34680,7 @@
+@@ -33998,8 +34682,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10847,7 +10935,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34205,8 +34886,7 @@
+@@ -34205,8 +34888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10857,7 +10945,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34351,8 +35031,7 @@
+@@ -34351,8 +35033,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10867,7 +10955,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34525,8 +35204,7 @@
+@@ -34525,8 +35206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10877,7 +10965,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34585,8 +35263,7 @@
+@@ -34585,8 +35265,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10887,7 +10975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34681,8 +35358,7 @@
+@@ -34681,8 +35360,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10897,7 +10985,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34748,8 +35424,7 @@
+@@ -34748,8 +35426,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10907,7 +10995,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34814,8 +35489,7 @@
+@@ -34814,8 +35491,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10917,7 +11005,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34878,8 +35552,7 @@
+@@ -34878,8 +35554,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10927,7 +11015,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34940,8 +35613,7 @@
+@@ -34940,8 +35615,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10937,7 +11025,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35011,8 +35683,7 @@
+@@ -35011,8 +35685,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10947,7 +11035,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35078,8 +35749,7 @@
+@@ -35078,8 +35751,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10957,7 +11045,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35145,8 +35815,7 @@
+@@ -35145,8 +35817,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10967,7 +11055,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35231,8 +35900,7 @@
+@@ -35231,8 +35902,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10977,7 +11065,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35337,8 +36005,7 @@
+@@ -35337,8 +36007,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10987,7 +11075,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35403,8 +36070,7 @@
+@@ -35403,8 +36072,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10997,7 +11085,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35479,8 +36145,7 @@
+@@ -35479,8 +36147,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11007,7 +11095,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35559,8 +36224,7 @@
+@@ -35559,8 +36226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11017,7 +11105,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35749,8 +36413,7 @@
+@@ -35749,8 +36415,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11027,7 +11115,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35812,8 +36475,7 @@
+@@ -35812,8 +36477,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11037,7 +11125,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35853,8 +36515,7 @@
+@@ -35853,8 +36517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11047,7 +11135,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35910,8 +36571,7 @@
+@@ -35910,8 +36573,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11057,7 +11145,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35951,8 +36611,7 @@
+@@ -35951,8 +36613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11067,7 +11155,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36016,8 +36675,7 @@
+@@ -36016,8 +36677,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11077,7 +11165,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36048,10 +36706,8 @@
+@@ -36048,10 +36708,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11090,7 +11178,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36163,8 +36819,7 @@
+@@ -36163,8 +36821,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11100,7 +11188,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36226,8 +36881,7 @@
+@@ -36226,8 +36883,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11110,7 +11198,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36267,8 +36921,7 @@
+@@ -36267,8 +36923,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11120,7 +11208,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36324,8 +36977,7 @@
+@@ -36324,8 +36979,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11130,7 +11218,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36365,8 +37017,7 @@
+@@ -36365,8 +37019,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11140,7 +11228,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36430,8 +37081,7 @@
+@@ -36430,8 +37083,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11150,7 +11238,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36462,10 +37112,8 @@
+@@ -36462,10 +37114,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11163,7 +11251,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36577,8 +37225,7 @@
+@@ -36577,8 +37227,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11173,7 +11261,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36640,8 +37287,7 @@
+@@ -36640,8 +37289,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11183,7 +11271,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36681,8 +37327,7 @@
+@@ -36681,8 +37329,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11193,7 +11281,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36738,8 +37383,7 @@
+@@ -36738,8 +37385,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11203,7 +11291,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36779,8 +37423,7 @@
+@@ -36779,8 +37425,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11213,7 +11301,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36844,8 +37487,7 @@
+@@ -36844,8 +37489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11223,7 +11311,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36876,10 +37518,8 @@
+@@ -36876,10 +37520,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11236,7 +11324,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36991,8 +37631,7 @@
+@@ -36991,8 +37633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11246,7 +11334,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37054,8 +37693,7 @@
+@@ -37054,8 +37695,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11256,7 +11344,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37095,8 +37733,7 @@
+@@ -37095,8 +37735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11266,7 +11354,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37152,8 +37789,7 @@
+@@ -37152,8 +37791,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11276,7 +11364,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37193,8 +37829,7 @@
+@@ -37193,8 +37831,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11286,7 +11374,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37258,8 +37893,7 @@
+@@ -37258,8 +37895,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11296,7 +11384,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37290,10 +37924,8 @@
+@@ -37290,10 +37926,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11309,7 +11397,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37408,8 +38040,7 @@
+@@ -37408,8 +38042,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11319,7 +11407,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37451,8 +38082,7 @@
+@@ -37451,8 +38084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11329,7 +11417,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37509,8 +38139,7 @@
+@@ -37509,8 +38141,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11339,7 +11427,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37692,8 +38321,7 @@
+@@ -37692,8 +38323,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11349,7 +11437,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37747,9 +38375,6 @@
+@@ -37747,9 +38377,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11359,7 +11447,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37783,8 +38408,7 @@
+@@ -37783,8 +38410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11369,7 +11457,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37888,8 +38512,7 @@
+@@ -37888,8 +38514,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11379,7 +11467,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37968,9 +38591,6 @@
+@@ -37968,9 +38593,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11389,7 +11477,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38001,8 +38621,7 @@
+@@ -38001,8 +38623,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11399,7 +11487,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38103,8 +38722,7 @@
+@@ -38103,8 +38724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11409,7 +11497,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38183,9 +38801,6 @@
+@@ -38183,9 +38803,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11419,7 +11507,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38216,8 +38831,7 @@
+@@ -38216,8 +38833,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11429,7 +11517,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38318,8 +38932,7 @@
+@@ -38318,8 +38934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11439,7 +11527,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38398,9 +39011,6 @@
+@@ -38398,9 +39013,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11449,7 +11537,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38436,8 +39046,7 @@
+@@ -38436,8 +39048,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11459,7 +11547,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38544,8 +39153,7 @@
+@@ -38544,8 +39155,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11469,7 +11557,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38624,9 +39232,6 @@
+@@ -38624,9 +39234,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11479,7 +11567,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38661,8 +39266,7 @@
+@@ -38661,8 +39268,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11489,7 +11577,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38767,8 +39371,7 @@
+@@ -38767,8 +39373,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11499,7 +11587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38847,9 +39450,6 @@
+@@ -38847,9 +39452,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11509,7 +11597,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38882,8 +39482,7 @@
+@@ -38882,8 +39484,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11519,7 +11607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38986,8 +39585,7 @@
+@@ -38986,8 +39587,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11529,7 +11617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39066,9 +39664,6 @@
+@@ -39066,9 +39666,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11539,7 +11627,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39101,8 +39696,7 @@
+@@ -39101,8 +39698,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11549,7 +11637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39205,8 +39799,7 @@
+@@ -39205,8 +39801,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11559,7 +11647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39284,9 +39877,6 @@
+@@ -39284,9 +39879,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11569,7 +11657,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39319,8 +39909,7 @@
+@@ -39319,8 +39911,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11579,7 +11667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39423,8 +40012,7 @@
+@@ -39423,8 +40014,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11589,7 +11677,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39518,8 +40106,7 @@
+@@ -39518,8 +40108,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11599,7 +11687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39706,8 +40293,7 @@
+@@ -39706,8 +40295,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11609,7 +11697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39777,8 +40363,7 @@
+@@ -39777,8 +40365,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11619,7 +11707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39931,8 +40516,7 @@
+@@ -39931,8 +40518,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11629,7 +11717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40466,8 +41050,7 @@
+@@ -40466,8 +41052,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11639,7 +11727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40758,8 +41341,7 @@
+@@ -40758,8 +41343,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11649,7 +11737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40904,8 +41486,7 @@
+@@ -40904,8 +41488,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11659,7 +11747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40991,8 +41572,7 @@
+@@ -40991,8 +41574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11669,7 +11757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41054,8 +41634,7 @@
+@@ -41054,8 +41636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11679,7 +11767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41126,8 +41705,7 @@
+@@ -41126,8 +41707,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11689,7 +11777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41217,8 +41795,7 @@
+@@ -41217,8 +41797,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11699,7 +11787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41292,8 +41869,7 @@
+@@ -41292,8 +41871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11709,7 +11797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41403,8 +41979,7 @@
+@@ -41403,8 +41981,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11719,7 +11807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41573,8 +42148,7 @@
+@@ -41573,8 +42150,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11729,16 +11817,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41636,7 +42210,7 @@
+@@ -41636,7 +42212,7 @@
  do
    for j in qsql.html;
    do
 -    echo "configure: 41639: $i/$j" >&5
-+    echo "configure: 42213: $i/$j" >&5
++    echo "configure: 42215: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -41981,8 +42555,7 @@
+@@ -41981,8 +42557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11748,7 +11836,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42075,8 +42648,7 @@
+@@ -42075,8 +42650,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11758,16 +11846,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42248,7 +42820,7 @@
+@@ -42248,7 +42822,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 42251: $i/$j" >&5
-+    echo "configure: 42823: $i/$j" >&5
++    echo "configure: 42825: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42303,8 +42875,7 @@
+@@ -42303,8 +42877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11777,7 +11865,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42553,8 +43124,7 @@
+@@ -42553,8 +43126,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11787,7 +11875,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42603,8 +43173,7 @@
+@@ -42603,8 +43175,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11797,7 +11885,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42707,8 +43276,7 @@
+@@ -42707,8 +43278,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11807,7 +11895,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42774,8 +43342,7 @@
+@@ -42774,8 +43344,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11817,7 +11905,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43033,8 +43600,7 @@
+@@ -43033,8 +43602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11827,7 +11915,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43099,8 +43665,7 @@
+@@ -43099,8 +43667,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11837,7 +11925,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43250,8 +43815,7 @@
+@@ -43250,8 +43817,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11847,7 +11935,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43404,8 +43968,7 @@
+@@ -43404,8 +43970,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11857,7 +11945,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43509,8 +44072,7 @@
+@@ -43509,8 +44074,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11867,7 +11955,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43629,8 +44191,7 @@
+@@ -43629,8 +44193,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11877,7 +11965,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43761,8 +44322,7 @@
+@@ -43761,8 +44324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11887,7 +11975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44155,8 +44715,7 @@
+@@ -44155,8 +44717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11897,7 +11985,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44326,8 +44885,7 @@
+@@ -44326,8 +44887,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11907,7 +11995,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44379,13 +44937,13 @@
+@@ -44379,13 +44939,13 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -11925,7 +12013,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44417,8 +44975,7 @@
+@@ -44417,8 +44977,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11935,7 +12023,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44430,20 +44987,20 @@
+@@ -44430,20 +44989,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11961,7 +12049,7 @@
    ac_font_enc_lib=1
  else
    ac_font_enc_lib=0
-@@ -44453,7 +45010,7 @@
+@@ -44453,7 +45012,7 @@
       LIBS="$kde_save_LIBS"
  
              if test "$ac_font_enc_lib" = "1"; then
@@ -11970,7 +12058,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FONT_ENC 1
-@@ -44504,8 +45061,7 @@
+@@ -44504,8 +45063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11980,7 +12068,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44735,8 +45291,7 @@
+@@ -44735,8 +45293,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11990,7 +12078,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44802,8 +45357,7 @@
+@@ -44802,8 +45359,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12000,7 +12088,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44849,8 +45403,7 @@
+@@ -44849,8 +45405,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12010,7 +12098,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44930,8 +45483,7 @@
+@@ -44930,8 +45485,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12020,7 +12108,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45021,8 +45573,7 @@
+@@ -45021,8 +45575,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12030,7 +12118,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45150,8 +45701,7 @@
+@@ -45150,8 +45703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12040,7 +12128,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45248,8 +45798,7 @@
+@@ -45248,8 +45800,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12050,7 +12138,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45336,8 +45885,7 @@
+@@ -45336,8 +45887,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12060,7 +12148,53 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45544,8 +46092,7 @@
+@@ -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 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12070,7 +12204,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45754,8 +46301,7 @@
+@@ -45754,8 +46327,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12080,7 +12214,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45833,8 +46379,7 @@
+@@ -45833,8 +46405,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12090,7 +12224,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45897,8 +46442,7 @@
+@@ -45897,8 +46468,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12100,7 +12234,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45982,8 +46526,7 @@
+@@ -45982,8 +46552,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12110,7 +12244,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46063,8 +46606,7 @@
+@@ -46063,8 +46632,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12120,7 +12254,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46165,8 +46707,7 @@
+@@ -46165,8 +46733,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12130,7 +12264,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46229,8 +46770,7 @@
+@@ -46229,8 +46796,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12140,7 +12274,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46319,8 +46859,7 @@
+@@ -46319,8 +46885,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12150,7 +12284,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46430,8 +46969,7 @@
+@@ -46430,8 +46995,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12160,7 +12294,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46528,8 +47066,7 @@
+@@ -46528,8 +47092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12170,7 +12304,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46760,8 +47297,7 @@
+@@ -46760,8 +47323,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12180,7 +12314,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46992,8 +47528,7 @@
+@@ -46992,8 +47554,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12190,7 +12324,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47093,8 +47628,7 @@
+@@ -47093,8 +47654,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12200,7 +12334,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47192,8 +47726,7 @@
+@@ -47192,8 +47752,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12210,7 +12344,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47261,8 +47794,7 @@
+@@ -47261,8 +47820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12220,7 +12354,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47306,8 +47838,7 @@
+@@ -47306,8 +47864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12230,7 +12364,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47373,8 +47904,7 @@
+@@ -47373,8 +47930,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12240,7 +12374,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47418,8 +47948,7 @@
+@@ -47418,8 +47974,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12250,7 +12384,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47488,8 +48017,7 @@
+@@ -47488,8 +48043,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12260,7 +12394,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47536,8 +48064,7 @@
+@@ -47536,8 +48090,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12270,7 +12404,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47647,8 +48174,7 @@
+@@ -47647,8 +48200,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12280,7 +12414,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47755,8 +48281,7 @@
+@@ -47755,8 +48307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12290,7 +12424,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47858,8 +48383,7 @@
+@@ -47858,8 +48409,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12300,7 +12434,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47970,8 +48494,7 @@
+@@ -47970,8 +48520,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12310,7 +12444,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48040,8 +48563,7 @@
+@@ -48040,8 +48589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12320,7 +12454,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48117,8 +48639,7 @@
+@@ -48117,8 +48665,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12330,7 +12464,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48174,8 +48695,7 @@
+@@ -48174,8 +48721,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12340,7 +12474,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48281,8 +48801,7 @@
+@@ -48281,8 +48827,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12350,7 +12484,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48391,8 +48910,7 @@
+@@ -48391,8 +48936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12360,7 +12494,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48495,8 +49013,7 @@
+@@ -48495,8 +49039,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12370,7 +12504,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48564,8 +49081,7 @@
+@@ -48564,8 +49107,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12380,7 +12514,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48655,8 +49171,7 @@
+@@ -48655,8 +49197,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12390,7 +12524,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48832,8 +49347,7 @@
+@@ -48832,8 +49373,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12400,7 +12534,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49140,8 +49654,7 @@
+@@ -49140,8 +49680,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12410,7 +12544,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49285,8 +49798,7 @@
+@@ -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 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12420,7 +12572,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49440,8 +49952,7 @@
+@@ -49440,8 +49981,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12430,7 +12582,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49527,8 +50038,7 @@
+@@ -49527,8 +50067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12440,7 +12592,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49609,8 +50119,7 @@
+@@ -49609,8 +50148,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12450,7 +12602,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49696,8 +50205,7 @@
+@@ -49696,8 +50234,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12460,16 +12612,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49782,7 +50290,7 @@
+@@ -49782,7 +50319,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 49785: $i/$j" >&5
-+    echo "configure: 50293: $i/$j" >&5
++    echo "configure: 50322: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -49837,8 +50345,7 @@
+@@ -49837,8 +50374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12479,7 +12631,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50075,8 +50582,7 @@
+@@ -50075,8 +50611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12489,7 +12641,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50248,8 +50754,7 @@
+@@ -50248,8 +50783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12499,7 +12651,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50420,8 +50925,7 @@
+@@ -50420,8 +50954,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12509,7 +12661,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50513,8 +51017,7 @@
+@@ -50513,8 +51046,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12519,7 +12671,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50603,8 +51106,7 @@
+@@ -50603,8 +51135,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12529,7 +12681,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50693,8 +51195,7 @@
+@@ -50693,8 +51224,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12539,7 +12691,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50788,8 +51289,7 @@
+@@ -50788,8 +51318,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12549,7 +12701,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50893,8 +51393,7 @@
+@@ -50893,8 +51422,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12559,7 +12711,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51083,8 +51582,7 @@
+@@ -51083,8 +51611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12569,25 +12721,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51142,7 +51640,7 @@
+@@ -51142,7 +51669,7 @@
  do
    for j in ldap.h;
    do
 -    echo "configure: 51145: $i/$j" >&5
-+    echo "configure: 51643: $i/$j" >&5
++    echo "configure: 51672: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_incdir=$i
-@@ -51164,7 +51662,7 @@
+@@ -51164,7 +51691,7 @@
  do
    for j in libldap.$ext;
    do
 -    echo "configure: 51167: $i/$j" >&5
-+    echo "configure: 51665: $i/$j" >&5
++    echo "configure: 51694: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_libdir=$i
-@@ -51260,8 +51758,7 @@
+@@ -51260,8 +51787,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12597,7 +12749,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51354,8 +51851,7 @@
+@@ -51354,8 +51880,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12607,7 +12759,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51450,8 +51946,7 @@
+@@ -51450,8 +51975,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12617,88 +12769,88 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51598,7 +52093,7 @@
+@@ -51598,7 +52122,7 @@
  do
    for j in libhal.h libhal-storage.h;
    do
 -    echo "configure: 51601: $i/$j" >&5
-+    echo "configure: 52096: $i/$j" >&5
++    echo "configure: 52125: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_incdir=$i
-@@ -51633,7 +52128,7 @@
+@@ -51633,7 +52157,7 @@
  do
    for j in libhal.so libhal-storage.so;
    do
 -    echo "configure: 51636: $i/$j" >&5
-+    echo "configure: 52131: $i/$j" >&5
++    echo "configure: 52160: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_libdir=$i
-@@ -51786,7 +52281,7 @@
+@@ -51786,7 +52310,7 @@
  do
    for j in dbus/dbus.h;
    do
 -    echo "configure: 51789: $i/$j" >&5
-+    echo "configure: 52284: $i/$j" >&5
++    echo "configure: 52313: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir=$i
-@@ -51803,7 +52298,7 @@
+@@ -51803,7 +52327,7 @@
  do
    for j in dbus/dbus-arch-deps.h;
    do
 -    echo "configure: 51806: $i/$j" >&5
-+    echo "configure: 52301: $i/$j" >&5
++    echo "configure: 52330: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir_arch_deps=$i
-@@ -51825,7 +52320,7 @@
+@@ -51825,7 +52349,7 @@
  do
    for j in libdbus-1.so;
    do
 -    echo "configure: 51828: $i/$j" >&5
-+    echo "configure: 52323: $i/$j" >&5
++    echo "configure: 52352: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_libdir=$i
-@@ -51975,7 +52470,7 @@
+@@ -51975,7 +52499,7 @@
  do
    for j in dbus/connection.h;
    do
 -    echo "configure: 51978: $i/$j" >&5
-+    echo "configure: 52473: $i/$j" >&5
++    echo "configure: 52502: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52002,7 +52497,7 @@
+@@ -52002,7 +52526,7 @@
  do
    for j in libdbus-qt-1.so;
    do
 -    echo "configure: 52005: $i/$j" >&5
-+    echo "configure: 52500: $i/$j" >&5
++    echo "configure: 52529: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52026,7 +52521,7 @@
+@@ -52026,7 +52550,7 @@
  do
    for j in dbus/connection.h;
    do
 -    echo "configure: 52029: $i/$j" >&5
-+    echo "configure: 52524: $i/$j" >&5
++    echo "configure: 52553: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52052,7 +52547,7 @@
+@@ -52052,7 +52576,7 @@
  do
    for j in libdbus-qt-1.so;
    do
 -    echo "configure: 52055: $i/$j" >&5
-+    echo "configure: 52550: $i/$j" >&5
++    echo "configure: 52579: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52178,8 +52673,7 @@
+@@ -52178,8 +52702,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12708,7 +12860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52208,8 +52702,7 @@
+@@ -52208,8 +52731,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12718,7 +12870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52279,8 +52772,7 @@
+@@ -52279,8 +52801,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12728,7 +12880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52332,8 +52824,7 @@
+@@ -52332,8 +52853,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12738,7 +12890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52404,8 +52895,7 @@
+@@ -52404,8 +52924,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12748,7 +12900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52457,8 +52947,7 @@
+@@ -52457,8 +52976,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12758,7 +12910,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52560,8 +53049,7 @@
+@@ -52560,8 +53078,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12768,7 +12920,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52730,8 +53218,7 @@
+@@ -52730,8 +53247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12778,7 +12930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52837,8 +53324,7 @@
+@@ -52837,8 +53353,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12788,7 +12940,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52913,8 +53399,7 @@
+@@ -52913,8 +53428,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12798,7 +12950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53102,8 +53587,7 @@
+@@ -53102,8 +53616,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12808,7 +12960,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53232,8 +53716,7 @@
+@@ -53232,8 +53745,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12818,7 +12970,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53319,8 +53802,7 @@
+@@ -53319,8 +53831,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12828,7 +12980,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53388,8 +53870,7 @@
+@@ -53388,8 +53899,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12838,7 +12990,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53444,8 +53925,7 @@
+@@ -53444,8 +53954,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12848,7 +13000,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54069,8 +54549,7 @@
+@@ -54069,8 +54578,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12858,7 +13010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54149,8 +54628,7 @@
+@@ -54149,8 +54657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12868,7 +13020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54213,8 +54691,7 @@
+@@ -54213,8 +54720,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12878,7 +13030,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54424,8 +54901,7 @@
+@@ -54424,8 +54930,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12888,7 +13040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54595,8 +55071,7 @@
+@@ -54595,8 +55100,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12898,7 +13050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54706,8 +55181,7 @@
+@@ -54706,8 +55210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12908,7 +13060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54806,8 +55280,7 @@
+@@ -54806,8 +55309,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12918,7 +13070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54893,8 +55366,7 @@
+@@ -54893,8 +55395,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12928,7 +13080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54980,8 +55452,7 @@
+@@ -54980,8 +55481,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12938,7 +13090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55079,8 +55550,7 @@
+@@ -55079,8 +55579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12948,7 +13100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55236,8 +55706,7 @@
+@@ -55236,8 +55735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12958,7 +13110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55317,8 +55786,7 @@
+@@ -55317,8 +55815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12968,7 +13120,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -56915,6 +57383,13 @@
+@@ -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 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -12982,7 +13143,29 @@
  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
-@@ -58517,6 +58992,9 @@
+@@ -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 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -12992,7 +13175,24 @@
  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
-@@ -59102,11 +59580,6 @@
+@@ -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 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -13004,7 +13204,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 +59618,12 @@
+@@ -59145,6 +59660,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -13040,9 +13240,125 @@
                  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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13052,7 +13368,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13061,7 +13386,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13073,7 +13398,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +729,10 @@
+@@ -726,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -13086,7 +13411,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
@@ -13112,7 +13437,15 @@
  
 --- doc/glossary/Makefile.in
 +++ doc/glossary/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13122,7 +13455,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13131,7 +13473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13143,7 +13485,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,7 +735,7 @@
  KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -13152,7 +13494,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
@@ -13178,7 +13520,15 @@
  
 --- doc/kappfinder/Makefile.in
 +++ doc/kappfinder/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13188,7 +13538,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13197,7 +13556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13211,7 +13570,15 @@
  mostlyclean-libtool:
 --- doc/kate/Makefile.in
 +++ doc/kate/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13221,7 +13588,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13230,7 +13606,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13242,7 +13618,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,7 +733,7 @@
+@@ -730,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
@@ -13251,7 +13627,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 +760,20 @@
+@@ -757,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
@@ -13275,9 +13651,109 @@
  	  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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13287,7 +13763,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13296,7 +13781,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13308,7 +13793,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,7 +735,7 @@
  KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -13317,7 +13802,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
@@ -13343,7 +13828,15 @@
  
 --- doc/kcontrol/background/Makefile.in
 +++ doc/kcontrol/background/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13353,7 +13846,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13362,7 +13864,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13376,7 +13878,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/bell/Makefile.in
 +++ doc/kcontrol/bell/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13386,7 +13896,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13395,7 +13914,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13409,7 +13928,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cache/Makefile.in
 +++ doc/kcontrol/cache/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13419,7 +13946,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13428,7 +13964,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13442,7 +13978,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/clock/Makefile.in
 +++ doc/kcontrol/clock/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13452,7 +13996,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13461,7 +14014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13475,7 +14028,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/colors/Makefile.in
 +++ doc/kcontrol/colors/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13485,7 +14046,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13494,7 +14064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13508,7 +14078,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cookies/Makefile.in
 +++ doc/kcontrol/cookies/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13518,7 +14096,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13527,7 +14114,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13541,7 +14128,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/crypto/Makefile.in
 +++ doc/kcontrol/crypto/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13551,7 +14146,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13560,7 +14164,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13574,7 +14178,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktop/Makefile.in
 +++ doc/kcontrol/desktop/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13584,7 +14196,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13593,7 +14214,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13607,7 +14228,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktopbehavior/Makefile.in
 +++ doc/kcontrol/desktopbehavior/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13617,7 +14246,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13626,7 +14264,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13640,7 +14278,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/ebrowsing/Makefile.in
 +++ doc/kcontrol/ebrowsing/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13650,7 +14296,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13659,7 +14314,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13673,7 +14328,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/email/Makefile.in
 +++ doc/kcontrol/email/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13683,7 +14346,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13692,7 +14364,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13706,7 +14378,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/energy/Makefile.in
 +++ doc/kcontrol/energy/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13716,7 +14396,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13725,7 +14414,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13739,7 +14428,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/filemanager/Makefile.in
 +++ doc/kcontrol/filemanager/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13749,7 +14446,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13758,7 +14464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13770,7 +14476,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,7 +735,7 @@
  KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -13779,7 +14485,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
@@ -13805,7 +14511,15 @@
  
 --- doc/kcontrol/filetypes/Makefile.in
 +++ doc/kcontrol/filetypes/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13815,7 +14529,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13824,7 +14547,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13838,7 +14561,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/fonts/Makefile.in
 +++ doc/kcontrol/fonts/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13848,7 +14579,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13857,7 +14597,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13871,7 +14611,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/helpindex/Makefile.in
 +++ doc/kcontrol/helpindex/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13881,7 +14629,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13890,7 +14647,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13904,7 +14661,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/icons/Makefile.in
 +++ doc/kcontrol/icons/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13914,7 +14679,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13923,7 +14697,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13937,7 +14711,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmaccess/Makefile.in
 +++ doc/kcontrol/kcmaccess/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13947,7 +14729,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13956,7 +14747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13970,7 +14761,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmcss/Makefile.in
 +++ doc/kcontrol/kcmcss/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13980,7 +14779,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -13989,7 +14797,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14003,7 +14811,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmfontinst/Makefile.in
 +++ doc/kcontrol/kcmfontinst/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14013,7 +14829,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14022,7 +14847,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14036,7 +14861,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmkonsole/Makefile.in
 +++ doc/kcontrol/kcmkonsole/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14046,7 +14879,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14055,7 +14897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14069,7 +14911,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmlaunch/Makefile.in
 +++ doc/kcontrol/kcmlaunch/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14079,7 +14929,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14088,7 +14947,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14102,7 +14961,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmnotify/Makefile.in
 +++ doc/kcontrol/kcmnotify/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14112,7 +14979,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14121,7 +14997,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14135,7 +15011,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmsmserver/Makefile.in
 +++ doc/kcontrol/kcmsmserver/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14145,7 +15029,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14154,7 +15047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14168,7 +15061,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmstyle/Makefile.in
 +++ doc/kcontrol/kcmstyle/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14178,7 +15079,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14187,7 +15097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14201,7 +15111,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmtaskbar/Makefile.in
 +++ doc/kcontrol/kcmtaskbar/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14211,7 +15129,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14220,7 +15147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14234,7 +15161,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kdm/Makefile.in
 +++ doc/kcontrol/kdm/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14244,7 +15179,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14253,7 +15197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14267,7 +15211,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keyboard/Makefile.in
 +++ doc/kcontrol/keyboard/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14277,7 +15229,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14286,7 +15247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14300,7 +15261,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keys/Makefile.in
 +++ doc/kcontrol/keys/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14310,7 +15279,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14319,7 +15297,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14333,7 +15311,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/khtml/Makefile.in
 +++ doc/kcontrol/khtml/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14343,7 +15329,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14352,7 +15347,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14364,7 +15359,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,7 +735,7 @@
  KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -14373,7 +15368,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
@@ -14399,7 +15394,15 @@
  
 --- doc/kcontrol/kwindecoration/Makefile.in
 +++ doc/kcontrol/kwindecoration/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14409,7 +15412,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14418,7 +15430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14432,7 +15444,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/language/Makefile.in
 +++ doc/kcontrol/language/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14442,7 +15462,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14451,7 +15480,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14463,84 +15492,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kcontrol/Makefile.in
-+++ doc/kcontrol/Makefile.in
-@@ -266,6 +266,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@
-@@ -552,7 +555,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 +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:
-@@ -896,7 +899,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 +926,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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14550,7 +15512,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14559,7 +15530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14573,7 +15544,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/netpref/Makefile.in
 +++ doc/kcontrol/netpref/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14583,7 +15562,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14592,7 +15580,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14606,7 +15594,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panel/Makefile.in
 +++ doc/kcontrol/panel/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14616,7 +15612,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14625,7 +15630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14639,7 +15644,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panelappearance/Makefile.in
 +++ doc/kcontrol/panelappearance/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14649,7 +15662,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14658,7 +15680,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14672,7 +15694,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/passwords/Makefile.in
 +++ doc/kcontrol/passwords/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14682,7 +15712,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14691,7 +15730,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14705,7 +15744,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/performance/Makefile.in
 +++ doc/kcontrol/performance/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14715,7 +15762,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14724,7 +15780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14738,7 +15794,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/proxy/Makefile.in
 +++ doc/kcontrol/proxy/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14748,7 +15812,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14757,7 +15830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14771,7 +15844,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/screensaver/Makefile.in
 +++ doc/kcontrol/screensaver/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14781,7 +15862,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14790,7 +15880,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14804,7 +15894,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/smb/Makefile.in
 +++ doc/kcontrol/smb/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14814,7 +15912,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14823,7 +15930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14837,7 +15944,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/spellchecking/Makefile.in
 +++ doc/kcontrol/spellchecking/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14847,7 +15962,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14856,7 +15980,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14870,7 +15994,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/useragent/Makefile.in
 +++ doc/kcontrol/useragent/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14880,7 +16012,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14889,7 +16030,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14903,7 +16044,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/windowmanagement/Makefile.in
 +++ doc/kcontrol/windowmanagement/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14913,7 +16062,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14922,7 +16080,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14936,7 +16094,15 @@
  mostlyclean-libtool:
 --- doc/kdcop/Makefile.in
 +++ doc/kdcop/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14946,7 +16112,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14955,7 +16130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14969,7 +16144,15 @@
  mostlyclean-libtool:
 --- doc/kdebugdialog/Makefile.in
 +++ doc/kdebugdialog/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14979,7 +16162,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -14988,7 +16180,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15002,7 +16194,15 @@
  mostlyclean-libtool:
 --- doc/kdeprint/Makefile.in
 +++ doc/kdeprint/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15012,7 +16212,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15021,7 +16230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15033,7 +16242,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +729,10 @@
+@@ -726,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -15046,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
@@ -15072,7 +16281,15 @@
  
 --- doc/kdesu/Makefile.in
 +++ doc/kdesu/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15082,7 +16299,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15091,7 +16317,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15105,7 +16331,15 @@
  mostlyclean-libtool:
 --- doc/kdm/Makefile.in
 +++ doc/kdm/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15115,7 +16349,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15124,7 +16367,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15136,9 +16379,29 @@
  	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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15148,7 +16411,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15157,7 +16429,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15171,7 +16443,15 @@
  mostlyclean-libtool:
 --- doc/khelpcenter/Makefile.in
 +++ doc/khelpcenter/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -15181,7 +16461,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15190,7 +16479,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15202,7 +16491,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -896,7 +899,7 @@
+@@ -896,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
@@ -15211,7 +16500,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 +926,20 @@
+@@ -923,20 +929,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
@@ -15237,7 +16526,15 @@
  
 --- doc/kicker/Makefile.in
 +++ doc/kicker/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15247,7 +16544,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15256,7 +16562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15268,7 +16574,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,10 +730,10 @@
+@@ -727,10 +733,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -15281,7 +16587,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 +760,20 @@
+@@ -757,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
@@ -15305,9 +16611,17 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- doc/kinfocenter/devices/Makefile.in
-+++ doc/kinfocenter/devices/Makefile.in
-@@ -250,6 +250,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15317,8 +16631,26 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -15326,7 +16658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -598,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15338,9 +16670,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/dma/Makefile.in
-+++ doc/kinfocenter/dma/Makefile.in
-@@ -250,6 +250,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15350,7 +16690,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15359,7 +16708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15371,9 +16720,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/interrupts/Makefile.in
-+++ doc/kinfocenter/interrupts/Makefile.in
-@@ -250,6 +250,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15383,7 +16740,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15392,7 +16758,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15404,9 +16770,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/ioports/Makefile.in
-+++ doc/kinfocenter/ioports/Makefile.in
-@@ -250,6 +250,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15416,7 +16790,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15425,7 +16808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15437,9 +16820,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/Makefile.in
-+++ doc/kinfocenter/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15449,17 +16840,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,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 +563,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -15467,7 +16858,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15481,7 +16872,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/memory/Makefile.in
 +++ doc/kinfocenter/memory/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15491,7 +16890,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15500,7 +16908,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15514,7 +16922,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/nics/Makefile.in
 +++ doc/kinfocenter/nics/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15524,7 +16940,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15533,7 +16958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15547,7 +16972,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/opengl/Makefile.in
 +++ doc/kinfocenter/opengl/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15557,7 +16990,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15566,7 +17008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15580,7 +17022,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/partitions/Makefile.in
 +++ doc/kinfocenter/partitions/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15590,7 +17040,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15599,7 +17058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15613,7 +17072,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pci/Makefile.in
 +++ doc/kinfocenter/pci/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15623,7 +17090,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15632,7 +17108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15646,7 +17122,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pcmcia/Makefile.in
 +++ doc/kinfocenter/pcmcia/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15656,7 +17140,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15665,7 +17158,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15679,7 +17172,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/processor/Makefile.in
 +++ doc/kinfocenter/processor/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15689,7 +17190,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15698,7 +17208,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15712,7 +17222,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/protocols/Makefile.in
 +++ doc/kinfocenter/protocols/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15722,7 +17240,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15731,7 +17258,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15745,7 +17272,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/samba/Makefile.in
 +++ doc/kinfocenter/samba/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15755,7 +17290,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15764,7 +17308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15778,7 +17322,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/scsi/Makefile.in
 +++ doc/kinfocenter/scsi/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15788,7 +17340,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15797,7 +17358,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15811,7 +17372,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/sound/Makefile.in
 +++ doc/kinfocenter/sound/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15821,7 +17390,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15830,7 +17408,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15844,7 +17422,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/usb/Makefile.in
 +++ doc/kinfocenter/usb/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15854,7 +17440,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15863,7 +17458,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15877,7 +17472,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/xserver/Makefile.in
 +++ doc/kinfocenter/xserver/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15887,7 +17490,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15896,7 +17508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15910,7 +17522,15 @@
  mostlyclean-libtool:
 --- doc/kioslave/Makefile.in
 +++ doc/kioslave/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15920,7 +17540,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15929,7 +17558,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15941,7 +17570,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +729,10 @@
+@@ -726,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -15954,7 +17583,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
@@ -15980,7 +17609,15 @@
  
 --- doc/klipper/Makefile.in
 +++ doc/klipper/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15990,7 +17627,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -15999,7 +17645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16013,7 +17659,15 @@
  mostlyclean-libtool:
 --- doc/kmenuedit/Makefile.in
 +++ doc/kmenuedit/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16023,7 +17677,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16032,7 +17695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16044,7 +17707,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,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
@@ -16053,7 +17716,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
@@ -16079,7 +17742,15 @@
  
 --- doc/knetattach/Makefile.in
 +++ doc/knetattach/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16089,7 +17760,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16098,7 +17778,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16112,7 +17792,15 @@
  mostlyclean-libtool:
 --- doc/kompmgr/Makefile.in
 +++ doc/kompmgr/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16122,7 +17810,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16131,7 +17828,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16145,7 +17842,15 @@
  mostlyclean-libtool:
 --- doc/konqueror/Makefile.in
 +++ doc/konqueror/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16155,7 +17860,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16164,7 +17878,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16176,7 +17890,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,10 +730,10 @@
+@@ -727,10 +733,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -16189,7 +17903,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 +760,20 @@
+@@ -757,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
@@ -16215,7 +17929,15 @@
  
 --- doc/konsole/Makefile.in
 +++ doc/konsole/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16225,7 +17947,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16234,7 +17965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16246,7 +17977,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +732,7 @@
+@@ -729,7 +735,7 @@
  KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -16255,7 +17986,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
@@ -16281,7 +18012,15 @@
  
 --- doc/kpager/Makefile.in
 +++ doc/kpager/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16291,7 +18030,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16300,7 +18048,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16314,7 +18062,15 @@
  mostlyclean-libtool:
 --- doc/ksplashml/Makefile.in
 +++ doc/ksplashml/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16324,7 +18080,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16333,7 +18098,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16347,7 +18112,15 @@
  mostlyclean-libtool:
 --- doc/ksysguard/Makefile.in
 +++ doc/ksysguard/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16357,7 +18130,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16366,7 +18148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16380,7 +18162,15 @@
  mostlyclean-libtool:
 --- doc/kwrite/Makefile.in
 +++ doc/kwrite/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16390,7 +18180,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16399,7 +18198,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16413,7 +18212,15 @@
  mostlyclean-libtool:
 --- doc/kxkb/Makefile.in
 +++ doc/kxkb/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16423,7 +18230,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16432,7 +18248,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16444,49 +18260,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -266,6 +266,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,13 +557,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 +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:
 --- doc/quickstart/Makefile.in
 +++ doc/quickstart/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16496,7 +18280,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16505,7 +18298,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16519,7 +18312,15 @@
  mostlyclean-libtool:
 --- doc/userguide/Makefile.in
 +++ doc/userguide/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16529,7 +18330,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16538,7 +18348,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16550,7 +18360,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +729,10 @@
+@@ -726,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -16563,7 +18373,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
@@ -16589,7 +18399,15 @@
  
 --- doc/visualdict/Makefile.in
 +++ doc/visualdict/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16599,7 +18417,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16608,7 +18435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16620,7 +18447,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +729,10 @@
+@@ -726,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -16633,7 +18460,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 +759,20 @@
+@@ -756,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
@@ -16657,9 +18484,17 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- drkonqi/debuggers/Makefile.in
-+++ drkonqi/debuggers/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16669,16 +18504,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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 +592,9 @@
+@@ -658,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16688,11 +18532,19 @@
 -$(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:
---- drkonqi/Makefile.in
-+++ drkonqi/Makefile.in
-@@ -314,6 +314,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16702,16 +18554,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -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
  
  .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 +661,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16721,11 +18582,19 @@
 -$(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)
+ 
+ mostlyclean-libtool:
 --- drkonqi/pics/Makefile.in
 +++ drkonqi/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16735,7 +18604,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16744,7 +18622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16758,7 +18636,15 @@
  mostlyclean-libtool:
 --- drkonqi/presets/Makefile.in
 +++ drkonqi/presets/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16768,7 +18654,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16777,7 +18672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16789,9 +18684,103 @@
  	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
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16801,7 +18790,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16810,7 +18808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16824,7 +18822,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Arcade/Makefile.in
 +++ kappfinder/apps/Games/Arcade/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16834,7 +18840,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16843,7 +18858,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16857,7 +18872,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Board/Makefile.in
 +++ kappfinder/apps/Games/Board/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16867,7 +18890,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -16876,7 +18908,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16890,7 +18922,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Card/Makefile.in
 +++ kappfinder/apps/Games/Card/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16900,7 +18940,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16909,7 +18958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16923,7 +18972,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Emulators/Makefile.in
 +++ kappfinder/apps/Games/Emulators/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16933,7 +18990,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -16942,7 +19008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16956,7 +19022,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Makefile.in
 +++ kappfinder/apps/Games/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16966,7 +19040,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16975,7 +19058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16989,7 +19072,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Roguelikes/Makefile.in
 +++ kappfinder/apps/Games/Roguelikes/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -16999,7 +19090,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17008,7 +19108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17022,7 +19122,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/TacticStrategy/Makefile.in
 +++ kappfinder/apps/Games/TacticStrategy/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17032,7 +19140,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17041,7 +19158,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17055,7 +19172,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Toys/Makefile.in
 +++ kappfinder/apps/Games/Toys/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17065,7 +19190,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17074,7 +19208,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17088,7 +19222,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Graphics/Makefile.in
 +++ kappfinder/apps/Graphics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17098,7 +19240,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17107,7 +19258,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17121,7 +19272,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Internet/Makefile.in
 +++ kappfinder/apps/Internet/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17131,7 +19290,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17140,7 +19308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17152,7 +19320,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -930,7 +933,7 @@
+@@ -930,7 +936,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17163,7 +19331,15 @@
  docs-am:
 --- kappfinder/apps/Internet/Terminal/Makefile.in
 +++ kappfinder/apps/Internet/Terminal/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17173,7 +19349,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -17182,7 +19367,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17196,7 +19381,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Makefile.in
 +++ kappfinder/apps/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -17206,7 +19399,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17215,7 +19417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17229,7 +19431,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Multimedia/Makefile.in
 +++ kappfinder/apps/Multimedia/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17239,7 +19449,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17248,7 +19467,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17260,7 +19479,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -780,7 +783,7 @@
+@@ -780,7 +786,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17271,7 +19490,15 @@
  docs-am:
 --- kappfinder/apps/Office/Makefile.in
 +++ kappfinder/apps/Office/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17281,7 +19508,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17290,7 +19526,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17302,7 +19538,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -759,7 +762,7 @@
+@@ -759,7 +765,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17313,7 +19549,15 @@
  docs-am:
 --- kappfinder/apps/System/Makefile.in
 +++ kappfinder/apps/System/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17323,7 +19567,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17332,7 +19585,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17346,7 +19599,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/System/Terminal/Makefile.in
 +++ kappfinder/apps/System/Terminal/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17356,7 +19617,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17365,7 +19635,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17379,7 +19649,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/Editors/Makefile.in
 +++ kappfinder/apps/Utilities/Editors/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17389,7 +19667,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -17398,7 +19685,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17412,7 +19699,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/Makefile.in
 +++ kappfinder/apps/Utilities/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17422,7 +19717,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -17431,7 +19735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17445,7 +19749,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/xutils/Makefile.in
 +++ kappfinder/apps/Utilities/xutils/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -17455,7 +19767,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -17464,7 +19785,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17476,9 +19797,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kappfinder/Makefile.in
-+++ kappfinder/Makefile.in
-@@ -323,6 +323,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17488,16 +19817,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -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
  
  .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)
+-$(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*) \
-@@ -662,9 +665,9 @@
+@@ -597,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17507,47 +19845,19 @@
 -$(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 +1095,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:
+ mostlyclean-libtool:
 --- kate/app/Makefile.in
 +++ kate/app/Makefile.in
-@@ -347,6 +347,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17557,7 +19867,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -677,7 +680,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17566,7 +19885,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -715,9 +718,9 @@
+@@ -715,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17580,7 +19899,15 @@
  	@$(NORMAL_INSTALL)
 --- kate/data/Makefile.in
 +++ kate/data/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17590,7 +19917,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17599,7 +19935,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17613,7 +19949,15 @@
  mostlyclean-libtool:
 --- kate/interfaces/Makefile.in
 +++ kate/interfaces/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17623,7 +19967,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17632,7 +19985,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17644,7 +19997,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -899,6 +902,13 @@
+@@ -899,6 +905,13 @@
  .NOEXPORT:
  
  #>+ 3
@@ -17658,7 +20011,7 @@
  documentmanager.moc: $(srcdir)/documentmanager.h
  	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
  
-@@ -906,39 +916,39 @@
+@@ -906,39 +919,39 @@
  mocs: documentmanager.moc
  
  #>+ 3
@@ -17713,7 +20066,7 @@
  
  #>+ 3
  viewmanager.moc: $(srcdir)/viewmanager.h
-@@ -948,15 +958,8 @@
+@@ -948,15 +961,8 @@
  mocs: viewmanager.moc
  
  #>+ 3
@@ -17730,7 +20083,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1003,7 +1006,7 @@
+@@ -1003,7 +1009,7 @@
  
  
  #>+ 11
@@ -17739,7 +20092,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 +1044,15 @@
+@@ -1041,15 +1047,15 @@
  #>+ 19
  documentmanager.o: documentmanager.moc 
  toolviewmanager.o: toolviewmanager.moc 
@@ -17757,9 +20110,17 @@
  nmcheck: 
  plugin.lo: plugin.moc 
  plugin.o: plugin.moc 
---- kate/Makefile.in
-+++ kate/Makefile.in
-@@ -268,6 +268,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17769,16 +20130,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .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)
+-$(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 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17790,9 +20160,86 @@
  	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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17802,7 +20249,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -17811,7 +20267,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17823,7 +20279,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -724,51 +727,51 @@
+@@ -724,51 +730,51 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17901,9 +20357,17 @@
  
  #>+ 15
  force-reedit:
---- kate/pics/Makefile.in
-+++ kate/pics/Makefile.in
-@@ -276,6 +276,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17913,16 +20377,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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*) \
-@@ -607,9 +610,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17932,80 +20405,19 @@
 -$(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:
-@@ -928,43 +931,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
-@@ -300,6 +300,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18015,16 +20427,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .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*) \
-@@ -639,9 +642,9 @@
+@@ -624,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18034,11 +20455,19 @@
 -$(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-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kcheckpass/Makefile.in
-+++ kcheckpass/Makefile.in
-@@ -286,6 +286,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18048,16 +20477,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -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 @@
  
  .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 +627,9 @@
+@@ -664,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18067,11 +20505,19 @@
 -$(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcminit/Makefile.in
-+++ kcminit/Makefile.in
-@@ -325,6 +325,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18081,16 +20527,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -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
  
  .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*) \
-@@ -664,9 +667,9 @@
+@@ -618,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18100,11 +20555,19 @@
 -$(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)
+ 
+ mostlyclean-libtool:
 --- kcontrol/access/Makefile.in
 +++ kcontrol/access/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -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@
@@ -18114,7 +20577,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18123,7 +20595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18137,7 +20609,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/accessibility/Makefile.in
 +++ kcontrol/accessibility/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18147,7 +20627,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18156,7 +20645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18170,7 +20659,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/arts/Makefile.in
 +++ kcontrol/arts/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18180,7 +20677,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18189,7 +20695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18203,7 +20709,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/background/Makefile.in
 +++ kcontrol/background/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18213,7 +20727,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -643,7 +646,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18222,7 +20745,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -681,9 +684,9 @@
+@@ -681,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18234,7 +20757,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1100,18 +1103,18 @@
+@@ -1100,18 +1106,18 @@
  
  
  #>+ 3
@@ -18259,7 +20782,7 @@
  
  #>+ 3
  bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1143,7 +1146,7 @@
+@@ -1143,7 +1149,7 @@
  
  #>+ 3
  clean-metasources:
@@ -18268,7 +20791,7 @@
  
  #>+ 2
  KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am 
-@@ -1262,8 +1265,8 @@
+@@ -1262,8 +1268,8 @@
  $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h 
  bgdialog.lo: bgdialog.moc 
  nmcheck: 
@@ -18280,7 +20803,15 @@
  
 --- kcontrol/background/pics/Makefile.in
 +++ kcontrol/background/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -18290,7 +20821,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -18299,7 +20839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18313,7 +20853,15 @@
  mostlyclean-libtool:
 --- kcontrol/bell/Makefile.in
 +++ kcontrol/bell/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18323,7 +20871,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18332,7 +20889,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18346,7 +20903,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/clock/Makefile.in
 +++ kcontrol/clock/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18356,7 +20921,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18365,7 +20939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18377,7 +20951,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -926,18 +929,18 @@
+@@ -926,18 +932,18 @@
  
  
  #>+ 3
@@ -18402,7 +20976,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -948,7 +951,7 @@
+@@ -948,7 +954,7 @@
  
  #>+ 3
  clean-metasources:
@@ -18411,7 +20985,7 @@
  
  #>+ 2
  KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am 
-@@ -999,7 +1002,7 @@
+@@ -999,7 +1005,7 @@
  
  
  #>+ 11
@@ -18420,7 +20994,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 +1044,5 @@
+@@ -1041,5 +1047,5 @@
  nmcheck-am: nmcheck
  dtime.lo: dtime.moc 
  main.o: main.moc 
@@ -18429,7 +21003,15 @@
 +dtime.o: dtime.moc 
 --- kcontrol/colors/Makefile.in
 +++ kcontrol/colors/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18439,7 +21021,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18448,7 +21039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18460,9 +21051,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/componentchooser/componentservices/Makefile.in
-+++ kcontrol/componentchooser/componentservices/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18472,16 +21071,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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 +592,9 @@
+@@ -653,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18491,11 +21099,28 @@
 -$(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
  
- mostlyclean-libtool:
---- kcontrol/componentchooser/Makefile.in
-+++ kcontrol/componentchooser/Makefile.in
-@@ -313,6 +313,9 @@
+ #>+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18505,16 +21130,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -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
  
  .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 +656,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18524,20 +21158,19 @@
 -$(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 +1070,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:
+ mostlyclean-libtool:
 --- kcontrol/crypto/Makefile.in
 +++ kcontrol/crypto/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18547,7 +21180,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18556,7 +21198,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18568,7 +21210,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -932,18 +935,18 @@
+@@ -932,18 +938,18 @@
  
  
  #>+ 3
@@ -18593,7 +21235,7 @@
  
  #>+ 3
  certexport.moc: $(srcdir)/certexport.h
-@@ -954,7 +957,7 @@
+@@ -954,7 +960,7 @@
  
  #>+ 3
  clean-metasources:
@@ -18602,7 +21244,7 @@
  
  #>+ 2
  KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am 
-@@ -1005,7 +1008,7 @@
+@@ -1005,7 +1011,7 @@
  
  
  #>+ 11
@@ -18613,7 +21255,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
 --- kcontrol/css/Makefile.in
 +++ kcontrol/css/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -18623,7 +21273,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18632,7 +21291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18646,7 +21305,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/display/Makefile.in
 +++ kcontrol/display/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18656,7 +21323,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18665,7 +21341,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18679,7 +21355,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/dnssd/Makefile.in
 +++ kcontrol/dnssd/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18689,7 +21373,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18698,7 +21391,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18712,7 +21405,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/Makefile.in
 +++ kcontrol/ebrowsing/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18722,7 +21423,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18731,7 +21441,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18743,9 +21453,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/ebrowsing/plugins/ikws/Makefile.in
-+++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18755,16 +21482,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -649,7 +652,7 @@
+@@ -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:
- .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 +690,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18774,11 +21510,19 @@
 -$(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)
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-@@ -260,6 +260,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18788,16 +21532,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -641,7 +644,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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*) \
-@@ -679,9 +682,9 @@
+@@ -687,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18807,20 +21560,28 @@
 -$(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:
-@@ -841,7 +844,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 
+-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 
  
- #>+ 2
- docs-am:
---- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -319,6 +319,9 @@
+ #>+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18830,16 +21591,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -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
  
  .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 +663,9 @@
+@@ -679,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18849,11 +21619,28 @@
 -$(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)
---- kcontrol/ebrowsing/plugins/Makefile.in
-+++ kcontrol/ebrowsing/plugins/Makefile.in
-@@ -266,6 +266,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18863,16 +21650,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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*) \
-@@ -594,9 +597,9 @@
+@@ -660,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18882,11 +21678,19 @@
 -$(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)
 --- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
 +++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18896,7 +21700,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18905,7 +21718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18919,7 +21732,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/Makefile.in
 +++ kcontrol/energy/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18929,7 +21750,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18938,7 +21768,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18952,7 +21782,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/pics/Makefile.in
 +++ kcontrol/energy/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -18962,7 +21800,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -18971,7 +21818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18985,7 +21832,15 @@
  mostlyclean-libtool:
 --- kcontrol/filetypes/Makefile.in
 +++ kcontrol/filetypes/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18995,7 +21850,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19004,7 +21868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19018,7 +21882,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/fonts/Makefile.in
 +++ kcontrol/fonts/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19028,7 +21900,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19037,7 +21918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19051,7 +21932,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/icons/Makefile.in
 +++ kcontrol/icons/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19061,7 +21950,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19070,7 +21968,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19082,7 +21980,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -958,18 +961,18 @@
+@@ -958,18 +964,18 @@
  
  
  #>+ 3
@@ -19107,7 +22005,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -980,7 +983,7 @@
+@@ -980,7 +986,7 @@
  
  #>+ 3
  clean-metasources:
@@ -19116,7 +22014,7 @@
  
  #>+ 2
  KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am 
-@@ -1031,7 +1034,7 @@
+@@ -1031,7 +1037,7 @@
  
  
  #>+ 11
@@ -19127,7 +22025,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
 --- kcontrol/info/Makefile.in
 +++ kcontrol/info/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19137,7 +22043,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19146,7 +22061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19158,7 +22073,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -945,7 +948,7 @@
+@@ -945,7 +951,7 @@
  	-rm -f  memory.moc
  
  #>+ 2
@@ -19167,9 +22082,17 @@
  
  #>+ 3
  clean-closures:
---- kcontrol/input/core/Makefile.in
-+++ kcontrol/input/core/Makefile.in
-@@ -283,6 +283,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19179,7 +22102,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19188,7 +22120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -682,9 +688,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19198,11 +22130,28 @@
 -$(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
  
- clean-noinstLTLIBRARIES:
---- kcontrol/input/Makefile.in
-+++ kcontrol/input/Makefile.in
-@@ -328,6 +328,9 @@
+ #>+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19212,7 +22161,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19221,7 +22179,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -616,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19231,20 +22189,19 @@
 -$(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 +1179,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:
+ clean-noinstLTLIBRARIES:
 --- kcontrol/input/pics/Makefile.in
 +++ kcontrol/input/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -19254,7 +22211,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -19263,7 +22229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19277,7 +22243,15 @@
  mostlyclean-libtool:
 --- kcontrol/input/xcursor/Makefile.in
 +++ kcontrol/input/xcursor/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19287,7 +22261,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19296,7 +22279,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19310,7 +22293,15 @@
  clean-noinstLTLIBRARIES:
 --- kcontrol/ioslaveinfo/Makefile.in
 +++ kcontrol/ioslaveinfo/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19320,7 +22311,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19329,7 +22329,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19343,7 +22343,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/joystick/Makefile.in
 +++ kcontrol/joystick/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19353,7 +22361,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19362,7 +22379,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19374,42 +22391,17 @@
  	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
-@@ -260,6 +260,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 @@
- 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 +596,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
-@@ -349,6 +349,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19419,7 +22411,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -669,7 +672,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19428,7 +22429,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -707,9 +710,9 @@
+@@ -707,9 +713,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19440,7 +22441,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1254,6 +1257,13 @@
+@@ -1254,6 +1260,13 @@
  mocs: indexwidget.moc
  
  #>+ 3
@@ -19454,7 +22455,7 @@
  dockcontainer.moc: $(srcdir)/dockcontainer.h
  	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
  
-@@ -1268,13 +1278,6 @@
+@@ -1268,13 +1281,6 @@
  mocs: aboutwidget.moc
  
  #>+ 3
@@ -19468,7 +22469,7 @@
  proxywidget.moc: $(srcdir)/proxywidget.h
  	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
  
-@@ -1332,10 +1335,10 @@
+@@ -1332,10 +1338,10 @@
  
  #>+ 3
  clean-metasources:
@@ -19481,7 +22482,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1347,23 +1350,23 @@
+@@ -1347,23 +1353,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -19514,7 +22515,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1404,7 +1407,7 @@
+@@ -1404,7 +1410,7 @@
  
  
  #>+ 11
@@ -19523,9 +22524,67 @@
  	@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
-@@ -293,6 +293,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19535,7 +22594,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19544,7 +22612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19556,7 +22624,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -932,7 +935,7 @@
+@@ -932,7 +938,7 @@
  	-rm -f  kcmkded.moc
  
  #>+ 2
@@ -19567,7 +22635,15 @@
  clean-closures:
 --- kcontrol/kdm/Makefile.in
 +++ kcontrol/kdm/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19577,7 +22653,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19586,7 +22671,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19600,7 +22685,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/keys/Makefile.in
 +++ kcontrol/keys/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19610,7 +22703,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19619,7 +22721,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19631,7 +22733,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1015,18 +1018,18 @@
+@@ -1015,18 +1021,18 @@
  mocs: treeview.moc
  
  #>+ 3
@@ -19656,7 +22758,7 @@
  
  #>+ 3
  keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1044,7 +1047,7 @@
+@@ -1044,7 +1050,7 @@
  
  #>+ 3
  clean-metasources:
@@ -19665,7 +22767,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 +1098,7 @@
+@@ -1095,7 +1101,7 @@
  
  
  #>+ 11
@@ -19674,9 +22776,67 @@
  	@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
-@@ -305,6 +305,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19686,7 +22846,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19695,7 +22864,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19707,7 +22876,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -984,16 +987,16 @@
+@@ -984,16 +990,16 @@
  
  #>+ 13
  install-kde-icons:
@@ -19729,7 +22898,15 @@
  #>+ 15
 --- kcontrol/kfontinst/kfile-plugin/Makefile.in
 +++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -19739,7 +22916,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19748,7 +22934,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19762,7 +22948,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kfontinst/Makefile.in
 +++ kcontrol/kfontinst/kfontinst/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19772,7 +22966,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -19781,7 +22984,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19795,7 +22998,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kio/Makefile.in
 +++ kcontrol/kfontinst/kio/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19805,7 +23016,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19814,7 +23034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19828,7 +23048,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/lib/Makefile.in
 +++ kcontrol/kfontinst/lib/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -19838,7 +23066,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19847,7 +23084,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19859,42 +23096,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/kfontinst/Makefile.in
-+++ kcontrol/kfontinst/Makefile.in
-@@ -278,6 +278,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@
-@@ -573,7 +576,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 +614,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
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19904,7 +23116,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19913,7 +23134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19927,7 +23148,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/viewpart/Makefile.in
 +++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19937,7 +23166,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19946,7 +23184,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19958,7 +23196,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1033,11 +1036,11 @@
+@@ -1033,11 +1039,11 @@
  .NOEXPORT:
  
  #>+ 3
@@ -19973,7 +23211,7 @@
  
  #>+ 3
  FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1047,11 +1050,11 @@
+@@ -1047,11 +1053,11 @@
  mocs: FontViewPartFactory.moc
  
  #>+ 3
@@ -19988,7 +23226,7 @@
  
  #>+ 3
  FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1071,7 +1074,7 @@
+@@ -1071,7 +1077,7 @@
  
  #>+ 3
  clean-metasources:
@@ -19997,7 +23235,7 @@
  
  #>+ 2
  KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc 
-@@ -1122,7 +1125,7 @@
+@@ -1122,7 +1128,7 @@
  
  
  #>+ 11
@@ -20006,7 +23244,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 +1165,9 @@
+@@ -1162,9 +1168,9 @@
  FontPreview.lo: FontPreview.moc 
  FontPreview.o: FontPreview.moc 
  nmcheck-am: nmcheck
@@ -20020,7 +23258,15 @@
  FontViewerApp.o: FontViewerApp.moc 
 --- kcontrol/kicker/Makefile.in
 +++ kcontrol/kicker/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20030,7 +23276,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20039,7 +23294,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20051,7 +23306,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1007,11 +1010,11 @@
+@@ -1007,11 +1013,11 @@
  
  
  #>+ 3
@@ -20066,7 +23321,7 @@
  
  #>+ 3
  menutab_impl.moc: $(srcdir)/menutab_impl.h
-@@ -1021,11 +1024,11 @@
+@@ -1021,11 +1027,11 @@
  mocs: menutab_impl.moc
  
  #>+ 3
@@ -20081,7 +23336,7 @@
  
  #>+ 3
  positionconfig.moc: $(srcdir)/positionconfig.h
-@@ -1092,10 +1095,10 @@
+@@ -1092,10 +1098,10 @@
  
  #>+ 3
  clean-metasources:
@@ -20094,7 +23349,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1157,7 +1160,7 @@
+@@ -1157,7 +1163,7 @@
  
  
  #>+ 11
@@ -20103,7 +23358,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 +1217,8 @@
+@@ -1214,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 
@@ -20115,7 +23370,15 @@
  menutab_impl.lo: menutab_impl.moc 
 --- kcontrol/kio/Makefile.in
 +++ kcontrol/kio/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20125,7 +23388,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -649,7 +652,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20134,7 +23406,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -687,9 +690,9 @@
+@@ -687,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20146,7 +23418,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1175,18 +1178,18 @@
+@@ -1175,18 +1181,18 @@
  mocs: smbrodlg.moc
  
  #>+ 3
@@ -20171,7 +23443,7 @@
  
  #>+ 3
  kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1260,10 +1263,10 @@
+@@ -1260,10 +1266,10 @@
  
  #>+ 3
  clean-metasources:
@@ -20184,7 +23456,7 @@
  
  #>+ 13
  clean-ui:
-@@ -1325,7 +1328,7 @@
+@@ -1325,7 +1331,7 @@
  
  
  #>+ 11
@@ -20195,7 +23467,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
 --- kcontrol/kio/uasproviders/Makefile.in
 +++ kcontrol/kio/uasproviders/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20205,7 +23485,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20214,7 +23503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20226,7 +23515,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -761,7 +764,7 @@
+@@ -761,7 +767,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -20237,7 +23526,15 @@
  docs-am:
 --- kcontrol/knotify/Makefile.in
 +++ kcontrol/knotify/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20247,7 +23544,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20256,7 +23562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -657,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20270,7 +23576,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/knotify/sounds/Makefile.in
 +++ kcontrol/knotify/sounds/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20280,7 +23594,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -661,7 +664,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20289,7 +23612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -699,9 +702,9 @@
+@@ -699,9 +705,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20303,7 +23626,15 @@
  mostlyclean-libtool:
 --- kcontrol/konq/Makefile.in
 +++ kcontrol/konq/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20313,7 +23644,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20322,7 +23662,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -657,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20334,7 +23674,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1053,7 +1056,7 @@
+@@ -1053,7 +1059,7 @@
  	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
  
  #>+ 2
@@ -20345,7 +23685,15 @@
  clean-idl:
 --- kcontrol/konqhtml/Makefile.in
 +++ kcontrol/konqhtml/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20355,7 +23703,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20364,7 +23721,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20376,7 +23733,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -983,13 +986,6 @@
+@@ -983,13 +989,6 @@
  mocs: jspolicies.moc
  
  #>+ 3
@@ -20390,7 +23747,7 @@
  main.moc: $(srcdir)/main.h
  	$(MOC) $(srcdir)/main.h -o main.moc
  
-@@ -1004,6 +1000,13 @@
+@@ -1004,6 +1003,13 @@
  mocs: jsopts.moc
  
  #>+ 3
@@ -20404,7 +23761,7 @@
  javaopts.moc: $(srcdir)/javaopts.h
  	$(MOC) $(srcdir)/javaopts.h -o javaopts.moc
  
-@@ -1032,22 +1035,22 @@
+@@ -1032,22 +1038,22 @@
  mocs: advancedTabDialog.moc
  
  #>+ 3
@@ -20434,7 +23791,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 +1107,7 @@
+@@ -1104,7 +1110,7 @@
  
  
  #>+ 11
@@ -20445,7 +23802,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
 --- kcontrol/konsole/Makefile.in
 +++ kcontrol/konsole/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20455,7 +23820,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20464,7 +23838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20476,9 +23850,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/krdb/ad/Makefile.in
-+++ kcontrol/krdb/ad/Makefile.in
-@@ -264,6 +264,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20488,16 +23870,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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*) \
-@@ -599,9 +602,9 @@
+@@ -643,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20507,20 +23898,19 @@
 -$(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 +785,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 
- 
- #>+ 2
- docs-am:
---- kcontrol/krdb/kcs/Makefile.in
-+++ kcontrol/krdb/kcs/Makefile.in
-@@ -260,6 +260,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20530,7 +23920,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20539,7 +23938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -599,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20549,20 +23948,28 @@
 -$(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:
-@@ -761,7 +764,7 @@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+@@ -782,7 +788,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 
+-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/Makefile.in
-+++ kcontrol/krdb/Makefile.in
-@@ -305,6 +305,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20572,16 +23979,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -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
  
  .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 +646,9 @@
+@@ -597,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20592,10 +24008,27 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
+ 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:
 --- kcontrol/krdb/pics/Makefile.in
 +++ kcontrol/krdb/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20605,7 +24038,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20614,7 +24056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20628,7 +24070,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20638,7 +24088,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20647,7 +24106,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20661,7 +24120,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20671,7 +24138,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20680,7 +24156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20694,7 +24170,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20704,7 +24188,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20713,7 +24206,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20727,7 +24220,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20737,7 +24238,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20746,7 +24256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20760,7 +24270,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/KDE_Classic/Makefile.in
 +++ kcontrol/krdb/themes/KDE_Classic/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20770,7 +24288,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20779,7 +24306,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20793,7 +24320,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Keramik/Makefile.in
 +++ kcontrol/krdb/themes/Keramik/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20803,7 +24338,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20812,7 +24356,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20826,7 +24370,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Makefile.in
 +++ kcontrol/krdb/themes/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -20836,7 +24388,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20845,7 +24406,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20859,7 +24420,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Plastik/Makefile.in
 +++ kcontrol/krdb/themes/Plastik/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20869,7 +24438,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20878,7 +24456,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20892,7 +24470,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Platinum/Makefile.in
 +++ kcontrol/krdb/themes/Platinum/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20902,7 +24488,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20911,7 +24506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20925,7 +24520,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Redmond/Makefile.in
 +++ kcontrol/krdb/themes/Redmond/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20935,7 +24538,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20944,7 +24556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20958,7 +24570,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Sunshine/Makefile.in
 +++ kcontrol/krdb/themes/Sunshine/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -20968,7 +24588,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -20977,7 +24606,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20991,7 +24620,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -21001,7 +24638,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -21010,7 +24656,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21024,7 +24670,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -21034,7 +24688,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -21043,7 +24706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21057,7 +24720,15 @@
  mostlyclean-libtool:
 --- kcontrol/kthememanager/Makefile.in
 +++ kcontrol/kthememanager/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21067,7 +24738,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21076,7 +24756,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21090,7 +24770,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/launch/Makefile.in
 +++ kcontrol/launch/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21100,7 +24788,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21109,7 +24806,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21121,42 +24818,17 @@
  	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
-@@ -260,6 +260,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@
-@@ -551,7 +554,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*) \
-@@ -589,9 +592,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
-@@ -319,6 +319,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21166,7 +24838,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21175,7 +24856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -658,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21187,7 +24868,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1086,11 +1089,11 @@
+@@ -1086,11 +1092,11 @@
  mocs: klocalesample.moc
  
  #>+ 3
@@ -21202,7 +24883,7 @@
  
  #>+ 3
  localemon.moc: $(srcdir)/localemon.h
-@@ -1100,11 +1103,11 @@
+@@ -1100,11 +1106,11 @@
  mocs: localemon.moc
  
  #>+ 3
@@ -21217,7 +24898,7 @@
  
  #>+ 3
  kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1122,7 +1125,7 @@
+@@ -1122,7 +1128,7 @@
  
  #>+ 3
  clean-metasources:
@@ -21226,7 +24907,7 @@
  
  #>+ 2
  KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am 
-@@ -1173,7 +1176,7 @@
+@@ -1173,7 +1179,7 @@
  
  
  #>+ 11
@@ -21235,9 +24916,17 @@
  	@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/pics/Makefile.in
-+++ kcontrol/locale/pics/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21247,7 +24936,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -21256,7 +24954,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21268,9 +24966,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kcontrol/Makefile.in
-+++ kcontrol/Makefile.in
-@@ -272,6 +272,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21280,8 +24986,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -21289,7 +25004,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21303,7 +25018,15 @@
  mostlyclean-libtool:
 --- kcontrol/nics/Makefile.in
 +++ kcontrol/nics/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21313,7 +25036,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21322,7 +25054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21336,7 +25068,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/performance/Makefile.in
 +++ kcontrol/performance/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21346,7 +25086,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21355,7 +25104,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21369,7 +25118,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/pics/Makefile.in
 +++ kcontrol/pics/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21379,7 +25136,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21388,7 +25154,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21400,7 +25166,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -723,581 +726,581 @@
+@@ -723,581 +729,581 @@
  .NOEXPORT:
  
  #>+ 2
@@ -22489,7 +26255,15 @@
  force-reedit:
 --- kcontrol/privacy/Makefile.in
 +++ kcontrol/privacy/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22499,7 +26273,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22508,7 +26291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22522,7 +26305,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/randr/Makefile.in
 +++ kcontrol/randr/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22532,7 +26323,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22541,7 +26341,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22555,7 +26355,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/samba/Makefile.in
 +++ kcontrol/samba/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22565,7 +26373,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22574,7 +26391,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22588,7 +26405,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/screensaver/Makefile.in
 +++ kcontrol/screensaver/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22598,7 +26423,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22607,7 +26441,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22621,7 +26455,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smartcard/Makefile.in
 +++ kcontrol/smartcard/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22631,7 +26473,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22640,7 +26491,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22654,7 +26505,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smserver/Makefile.in
 +++ kcontrol/smserver/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22664,7 +26523,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22673,7 +26541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22687,7 +26555,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/spellchecking/Makefile.in
 +++ kcontrol/spellchecking/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22697,7 +26573,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22706,7 +26591,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22718,9 +26603,17 @@
  	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
-@@ -293,6 +293,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22730,7 +26623,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22739,7 +26641,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -656,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22751,9 +26653,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/style/Makefile.in
-+++ kcontrol/style/Makefile.in
-@@ -315,6 +315,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22763,7 +26673,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22772,7 +26691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -628,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22786,7 +26705,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/taskbar/Makefile.in
 +++ kcontrol/taskbar/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22796,7 +26723,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22805,7 +26741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22819,7 +26755,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/usbview/Makefile.in
 +++ kcontrol/usbview/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -22829,7 +26773,26 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22838,7 +26801,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22852,7 +26815,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/view1394/Makefile.in
 +++ kcontrol/view1394/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -22862,7 +26833,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22871,7 +26851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22885,7 +26865,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/xinerama/Makefile.in
 +++ kcontrol/xinerama/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22895,7 +26883,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22904,7 +26901,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22918,7 +26915,15 @@
  	@$(NORMAL_INSTALL)
 --- kdcop/Makefile.in
 +++ kdcop/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22928,7 +26933,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22937,7 +26951,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22951,7 +26965,15 @@
  	@$(NORMAL_INSTALL)
 --- kdebugdialog/Makefile.in
 +++ kdebugdialog/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22961,7 +26983,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22970,7 +27001,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22984,7 +27015,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeeject/Makefile.in
 +++ kdeeject/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22994,7 +27033,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23003,7 +27051,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23015,9 +27063,67 @@
  	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
-@@ -313,6 +313,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23027,7 +27133,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23036,7 +27151,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -658,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23050,7 +27165,15 @@
  	@$(NORMAL_INSTALL)
 --- kdepasswd/kcm/pics/Makefile.in
 +++ kdepasswd/kcm/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -23060,7 +27183,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23069,7 +27201,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23081,7 +27213,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +760,7 @@
+@@ -757,7 +763,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -23090,9 +27222,17 @@
  
  #>+ 2
  docs-am:
---- kdepasswd/Makefile.in
-+++ kdepasswd/Makefile.in
-@@ -315,6 +315,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23102,16 +27242,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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:
- .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 +654,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23121,11 +27270,19 @@
 -$(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)
+ 
+ mostlyclean-libtool:
 --- kdeprint/descriptions/Makefile.in
 +++ kdeprint/descriptions/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23135,7 +27292,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23144,7 +27310,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23156,9 +27322,67 @@
  	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
-@@ -308,6 +308,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23168,7 +27392,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23177,7 +27410,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23189,7 +27422,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1028,38 +1031,38 @@
+@@ -1028,38 +1034,38 @@
  	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
  
  #>+ 2
@@ -23241,42 +27474,17 @@
  	-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  #>+ 15
---- kdeprint/kdeprint_part/Makefile.in
-+++ kdeprint/kdeprint_part/Makefile.in
-@@ -297,6 +297,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@
-@@ -605,7 +608,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 +646,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
-@@ -314,6 +314,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23286,7 +27494,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23295,7 +27512,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23307,7 +27524,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1067,29 +1070,29 @@
+@@ -1067,29 +1073,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -23351,7 +27568,15 @@
  force-reedit:
 --- kdeprint/kprinter/Makefile.in
 +++ kdeprint/kprinter/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23361,7 +27586,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23370,7 +27604,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23382,42 +27616,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kdeprint/Makefile.in
-+++ kdeprint/Makefile.in
-@@ -266,6 +266,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@
-@@ -556,7 +559,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 +597,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
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23427,7 +27636,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23436,7 +27654,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23448,7 +27666,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -945,29 +948,29 @@
+@@ -945,29 +951,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -23492,7 +27710,15 @@
  force-reedit:
 --- kdeprint/slave/Makefile.in
 +++ kdeprint/slave/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23502,7 +27728,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23511,7 +27746,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23525,7 +27760,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/slave/mimetypes/Makefile.in
 +++ kdeprint/slave/mimetypes/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -23535,7 +27778,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23544,7 +27796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23558,7 +27810,15 @@
  mostlyclean-libtool:
 --- kdeprint/slave/templates/Makefile.in
 +++ kdeprint/slave/templates/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -23568,7 +27828,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23577,7 +27846,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23589,9 +27858,149 @@
  	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
-@@ -278,6 +278,9 @@
+@@ -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@
@@ -23601,7 +28010,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23610,7 +28028,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23624,7 +28042,15 @@
  mostlyclean-libtool:
 --- kdesktop/init/Templates/Makefile.in
 +++ kdesktop/init/Templates/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23634,7 +28060,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23643,7 +28078,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -606,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23655,7 +28090,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -791,7 +794,7 @@
+@@ -791,7 +797,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -23666,7 +28101,15 @@
  docs-am:
 --- kdesktop/kwebdesktop/Makefile.in
 +++ kdesktop/kwebdesktop/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23676,7 +28119,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23685,7 +28137,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23699,7 +28151,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesktop/lock/Makefile.in
 +++ kdesktop/lock/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23709,7 +28169,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -23718,7 +28187,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23730,9 +28199,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kdesktop/Makefile.in
-+++ kdesktop/Makefile.in
-@@ -367,6 +367,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23742,16 +28219,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -706,7 +709,7 @@
+@@ -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:
- .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 +747,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23761,93 +28247,19 @@
 -$(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 +1423,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 +1458,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 +1472,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 +1503,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 +1572,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 +1584,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
-@@ -260,6 +260,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23857,7 +28269,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -23866,7 +28287,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23878,9 +28299,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdesktop/pics/Makefile.in
-+++ kdesktop/pics/Makefile.in
-@@ -262,6 +262,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23890,7 +28319,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -23899,7 +28337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23911,9 +28349,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdesktop/programs/Makefile.in
-+++ kdesktop/programs/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23923,8 +28369,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -23932,7 +28387,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23946,7 +28401,15 @@
  mostlyclean-libtool:
 --- kdesu/kdesu/Makefile.in
 +++ kdesu/kdesu/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23956,7 +28419,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23965,7 +28437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23979,7 +28451,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesu/kdesud/Makefile.in
 +++ kdesu/kdesud/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23989,7 +28469,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23998,7 +28487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24010,9 +28499,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kdesu/Makefile.in
-+++ kdesu/Makefile.in
-@@ -267,6 +267,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24022,16 +28519,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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 +598,9 @@
+@@ -625,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24041,11 +28547,19 @@
 -$(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:
---- kdialog/Makefile.in
-+++ kdialog/Makefile.in
-@@ -289,6 +289,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24055,16 +28569,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -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
  
  .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 +628,9 @@
+@@ -610,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24074,11 +28597,19 @@
 -$(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)
+ 
+ mostlyclean-libtool:
 --- kdm/backend/Makefile.in
 +++ kdm/backend/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24088,7 +28619,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -637,7 +640,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -24097,7 +28637,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -675,9 +678,9 @@
+@@ -675,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24111,7 +28651,15 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/Makefile.in
 +++ kdm/kfrontend/Makefile.in
-@@ -345,6 +345,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24121,7 +28669,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -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 @@
  xdg_menudir = @xdg_menudir@
  
  # use 'make GENKDMCONF_FLAGS=... install' to override
@@ -24130,7 +28687,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 +689,7 @@
+@@ -686,7 +692,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -24139,7 +28696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -724,9 +727,9 @@
+@@ -724,9 +730,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24153,7 +28710,15 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/pics/Makefile.in
 +++ kdm/kfrontend/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24163,7 +28728,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24172,7 +28746,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24186,7 +28760,15 @@
  mostlyclean-libtool:
 --- kdm/kfrontend/sessions/Makefile.in
 +++ kdm/kfrontend/sessions/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24196,7 +28778,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24205,7 +28796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24217,7 +28808,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 +804,7 @@
+@@ -801,7 +807,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -24228,7 +28819,15 @@
  docs-am:
 --- kdm/kfrontend/themer/Makefile.in
 +++ kdm/kfrontend/themer/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24238,7 +28837,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24247,7 +28855,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24259,7 +28867,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-@@ -878,18 +881,18 @@
+@@ -878,18 +884,18 @@
  mocs: kdmitem.moc
  
  #>+ 3
@@ -24284,7 +28892,7 @@
  
  #>+ 3
  kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -900,7 +903,7 @@
+@@ -900,7 +906,7 @@
  
  #>+ 3
  clean-metasources:
@@ -24293,7 +28901,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am 
-@@ -947,7 +950,7 @@
+@@ -947,7 +953,7 @@
  
  
  #>+ 11
@@ -24302,7 +28910,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 +992,8 @@
+@@ -989,8 +995,8 @@
  kdmlabel.o: kdmlabel.moc 
  $(srcdir)/kdmitem.cpp: ../../config.ci 
  $(srcdir)/kdmlayout.cpp: ../../config.ci 
@@ -24312,42 +28920,17 @@
  kdmitem.lo: kdmitem.moc 
  kdmpixmap.lo: kdmpixmap.moc 
  nmcheck: 
---- kdm/kfrontend/themes/circles/Makefile.in
-+++ kdm/kfrontend/themes/circles/Makefile.in
-@@ -260,6 +260,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-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*) \
-@@ -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:
 --- kdm/kfrontend/themes/Makefile.in
 +++ kdm/kfrontend/themes/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -24357,7 +28940,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -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:
@@ -24366,7 +28958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24378,9 +28970,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdm/Makefile.in
-+++ kdm/Makefile.in
-@@ -277,6 +277,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24390,8 +28990,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -24399,7 +29008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -598,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24413,7 +29022,15 @@
  mostlyclean-libtool:
 --- kdmlib/Makefile.in
 +++ kdmlib/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24423,7 +29040,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24432,7 +29058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24446,7 +29072,15 @@
  	@$(NORMAL_INSTALL)
 --- kfind/Makefile.in
 +++ kfind/Makefile.in
-@@ -338,6 +338,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24456,7 +29090,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -653,7 +656,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24465,7 +29108,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +694,9 @@
+@@ -691,9 +697,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24477,7 +29120,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1246,8 +1249,6 @@
+@@ -1246,8 +1252,6 @@
  
  #>+ 19
  install-kde-icons:
@@ -24486,7 +29129,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 +1257,15 @@
+@@ -1256,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
@@ -24505,7 +29148,15 @@
  force-reedit:
 --- kfind/pics/Makefile.in
 +++ kfind/pics/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24515,7 +29166,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -24524,7 +29184,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24536,7 +29196,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,22 +735,22 @@
+@@ -732,22 +738,22 @@
  #>+ 19
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
@@ -24569,42 +29229,17 @@
  
  #>+ 15
  force-reedit:
---- khelpcenter/htmlsearch/Makefile.in
-+++ khelpcenter/htmlsearch/Makefile.in
-@@ -329,6 +329,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@
-@@ -645,7 +648,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 +686,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
-@@ -350,6 +350,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24614,7 +29249,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -692,7 +695,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24623,7 +29267,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -730,9 +733,9 @@
+@@ -730,9 +736,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24635,7 +29279,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1305,11 +1308,11 @@
+@@ -1305,11 +1311,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
  
  #>+ 3
@@ -24650,7 +29294,7 @@
  
  #>+ 3
  navigator.moc: $(srcdir)/navigator.h
-@@ -1319,11 +1322,11 @@
+@@ -1319,11 +1325,11 @@
  mocs: navigator.moc
  
  #>+ 3
@@ -24665,7 +29309,7 @@
  
  #>+ 3
  fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1434,10 +1437,10 @@
+@@ -1434,10 +1440,10 @@
  
  #>+ 3
  clean-metasources:
@@ -24678,7 +29322,7 @@
  
  #>+ 6
  clean-idl:
-@@ -1497,7 +1500,7 @@
+@@ -1497,7 +1503,7 @@
  
  
  #>+ 11
@@ -24687,9 +29331,67 @@
  	@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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24699,7 +29401,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24708,7 +29419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24720,7 +29431,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,29 +735,29 @@
+@@ -732,29 +738,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -24761,7 +29472,15 @@
  force-reedit:
 --- khelpcenter/plugins/Applications/Makefile.in
 +++ khelpcenter/plugins/Applications/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -24771,7 +29490,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -24780,7 +29508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24794,7 +29522,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Makefile.in
 +++ khelpcenter/plugins/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24804,7 +29540,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24813,7 +29558,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24827,7 +29572,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Manpages/Makefile.in
 +++ khelpcenter/plugins/Manpages/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -24837,7 +29590,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24846,7 +29608,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24860,7 +29622,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Scrollkeeper/Makefile.in
 +++ khelpcenter/plugins/Scrollkeeper/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -24870,7 +29640,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -24879,7 +29658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24893,7 +29672,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Tutorials/Makefile.in
 +++ khelpcenter/plugins/Tutorials/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -24903,7 +29690,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -24912,7 +29708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24926,7 +29722,15 @@
  mostlyclean-libtool:
 --- khelpcenter/searchhandlers/Makefile.in
 +++ khelpcenter/searchhandlers/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -24936,7 +29740,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24945,7 +29758,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24957,9 +29770,76 @@
  	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 @@
+ 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@
+@@ -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
+ 
+ .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*) \
+@@ -608,9 +614,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:
 --- khotkeys/app/Makefile.in
 +++ khotkeys/app/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24969,7 +29849,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24978,7 +29867,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -678,9 +684,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24990,9 +29879,1032 @@
  	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
-@@ -262,6 +262,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25002,7 +30914,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25011,7 +30932,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25025,7 +30946,15 @@
  mostlyclean-libtool:
 --- khotkeys/kcontrol/Makefile.in
 +++ khotkeys/kcontrol/Makefile.in
-@@ -340,6 +340,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25035,7 +30964,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -665,7 +668,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25044,7 +30982,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -703,9 +706,9 @@
+@@ -703,9 +709,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25056,7 +30994,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1159,13 +1162,6 @@
+@@ -1159,13 +1165,6 @@
  mocs: gestures_settings_tab.moc
  
  #>+ 3
@@ -25070,7 +31008,7 @@
  gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
  	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
  
-@@ -1173,11 +1169,11 @@
+@@ -1173,11 +1172,11 @@
  mocs: gesture_triggers_tab.moc
  
  #>+ 3
@@ -25085,7 +31023,7 @@
  
  #>+ 3
  voicerecorder.moc: $(srcdir)/voicerecorder.h
-@@ -1187,6 +1183,13 @@
+@@ -1187,6 +1186,13 @@
  mocs: voicerecorder.moc
  
  #>+ 3
@@ -25099,7 +31037,7 @@
  tab_widget.moc: $(srcdir)/tab_widget.h
  	$(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
  
-@@ -1222,6 +1225,13 @@
+@@ -1222,6 +1228,13 @@
  mocs: action_list_widget.moc
  
  #>+ 3
@@ -25113,7 +31051,7 @@
  main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
  	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
  
-@@ -1236,13 +1246,6 @@
+@@ -1236,13 +1249,6 @@
  mocs: menuentry_widget.moc
  
  #>+ 3
@@ -25127,7 +31065,7 @@
  general_tab.moc: $(srcdir)/general_tab.h
  	$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
  
-@@ -1271,6 +1274,13 @@
+@@ -1271,6 +1277,13 @@
  mocs: gesturerecordpage.moc
  
  #>+ 3
@@ -25141,7 +31079,7 @@
  windowselector.moc: $(srcdir)/windowselector.h
  	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
  
-@@ -1285,13 +1295,6 @@
+@@ -1285,13 +1298,6 @@
  mocs: command_url_widget.moc
  
  #>+ 3
@@ -25155,7 +31093,7 @@
  keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
  	$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
  
-@@ -1330,7 +1333,7 @@
+@@ -1330,7 +1336,7 @@
  
  #>+ 3
  clean-metasources:
@@ -25164,7 +31102,7 @@
  
  #>+ 2
  KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am 
-@@ -1344,14 +1347,14 @@
+@@ -1344,14 +1350,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -25182,7 +31120,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1392,7 +1395,7 @@
+@@ -1392,7 +1398,7 @@
  
  
  #>+ 11
@@ -25193,7 +31131,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
 --- khotkeys/kcontrol/ui/Makefile.in
 +++ khotkeys/kcontrol/ui/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25203,7 +31149,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25212,7 +31167,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25224,7 +31179,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -870,7 +873,7 @@
+@@ -870,7 +876,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -25233,9 +31188,68 @@
  
  #>+ 23
  clean-ui:
---- khotkeys/Makefile.in
-+++ khotkeys/Makefile.in
-@@ -277,6 +277,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25245,16 +31259,52 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
- all: docs-am  all-recursive
+@@ -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
  
+ #>- 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*) \
-@@ -608,9 +611,9 @@
+@@ -659,37 +651,10 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25264,11 +31314,258 @@
 -$(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
  
- mostlyclean-libtool:
---- khotkeys/shared/Makefile.in
-+++ khotkeys/shared/Makefile.in
-@@ -309,6 +309,9 @@
+-#>- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25278,7 +31575,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25287,7 +31593,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -619,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25297,11 +31603,19 @@
 -$(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-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- khotkeys/update/Makefile.in
-+++ khotkeys/update/Makefile.in
-@@ -285,6 +285,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25311,16 +31625,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -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
  
  .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*) \
-@@ -619,9 +622,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25330,11 +31653,19 @@
 -$(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)
- 	@$(NORMAL_INSTALL)
---- kicker/applets/clock/Makefile.in
-+++ kicker/applets/clock/Makefile.in
-@@ -298,6 +298,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25344,16 +31675,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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:
- .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*) \
-@@ -641,9 +644,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25363,11 +31703,19 @@
 -$(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/applets/launcher/Makefile.in
-+++ kicker/applets/launcher/Makefile.in
-@@ -310,6 +310,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25377,7 +31725,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25386,7 +31743,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25398,9 +31755,17 @@
  	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
-@@ -295,6 +295,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25410,7 +31775,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25419,7 +31793,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -654,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25431,9 +31805,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/applets/Makefile.in
-+++ kicker/applets/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25443,16 +31825,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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 +597,9 @@
+@@ -633,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25462,11 +31853,19 @@
 -$(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)
 --- kicker/applets/media/Makefile.in
 +++ kicker/applets/media/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25476,7 +31875,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25485,7 +31893,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25499,7 +31907,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/menu/Makefile.in
 +++ kicker/applets/menu/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25509,7 +31925,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25518,7 +31943,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25532,7 +31957,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/minipager/Makefile.in
 +++ kicker/applets/minipager/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25542,7 +31975,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25551,7 +31993,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25565,7 +32007,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/naughty/Makefile.in
 +++ kicker/applets/naughty/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25575,7 +32025,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25584,7 +32043,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25598,7 +32057,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/run/Makefile.in
 +++ kicker/applets/run/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25608,7 +32075,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25617,7 +32093,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25631,7 +32107,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/swallow/Makefile.in
 +++ kicker/applets/swallow/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25641,7 +32125,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25650,7 +32143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25662,7 +32155,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -931,22 +934,22 @@
+@@ -931,22 +937,22 @@
  
  
  #>+ 3
@@ -25692,7 +32185,7 @@
  
  #>+ 2
  KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am 
-@@ -1002,7 +1005,7 @@
+@@ -1002,7 +1008,7 @@
  
  
  #>+ 11
@@ -25701,7 +32194,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 +1045,8 @@
+@@ -1042,8 +1048,8 @@
  swallow.o: swallow.moc 
  $(srcdir)/prefwidget.cpp: prefwidgetbase.h 
  nmcheck-am: nmcheck
@@ -25713,7 +32206,15 @@
  
 --- kicker/applets/systemtray/Makefile.in
 +++ kicker/applets/systemtray/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25723,7 +32224,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25732,7 +32242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25746,7 +32256,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/taskbar/Makefile.in
 +++ kicker/applets/taskbar/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25756,7 +32274,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25765,7 +32292,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25779,7 +32306,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/trash/Makefile.in
 +++ kicker/applets/trash/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25789,7 +32324,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25798,7 +32342,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25810,9 +32354,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/data/app_start_anim/Makefile.in
-+++ kicker/data/app_start_anim/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25822,8 +32374,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
- all: docs-am  all-am
+@@ -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)
@@ -25831,7 +32392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25843,9 +32404,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kicker/data/icons/actions/Makefile.in
-+++ kicker/data/icons/actions/Makefile.in
-@@ -250,6 +250,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25855,7 +32424,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -25864,7 +32442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25878,7 +32456,15 @@
  mostlyclean-libtool:
 --- kicker/data/icons/Makefile.in
 +++ kicker/data/icons/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -25888,7 +32474,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -25897,7 +32492,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25909,7 +32504,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -895,27 +898,27 @@
+@@ -895,27 +901,27 @@
  
  #>+ 23
  install-kde-icons:
@@ -25945,9 +32540,17 @@
  
  #>+ 15
  force-reedit:
---- kicker/data/kmenu_side/Makefile.in
-+++ kicker/data/kmenu_side/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25957,7 +32560,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -25966,7 +32578,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25978,9 +32590,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kicker/data/Makefile.in
-+++ kicker/data/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25990,8 +32610,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -25999,7 +32628,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26013,7 +32642,15 @@
  mostlyclean-libtool:
 --- kicker/data/tiles/Makefile.in
 +++ kicker/data/tiles/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -26023,7 +32660,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26032,7 +32678,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26044,7 +32690,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -803,7 +806,7 @@
+@@ -803,7 +809,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -26055,7 +32701,15 @@
  docs-am:
 --- kicker/data/wallpaper/Makefile.in
 +++ kicker/data/wallpaper/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -26065,7 +32719,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -26074,7 +32737,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26086,9 +32749,67 @@
  	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
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26098,7 +32819,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26107,7 +32837,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26121,7 +32851,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/extensions/kasbar/Makefile.in
 +++ kicker/extensions/kasbar/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26131,7 +32869,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26140,7 +32887,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -690,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26152,7 +32899,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1099,6 +1102,13 @@
+@@ -1099,6 +1105,13 @@
  mocs: kasbarextension.moc
  
  #>+ 3
@@ -26166,7 +32913,7 @@
  kasclockitem.moc: $(srcdir)/kasclockitem.h
  	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
  
-@@ -1113,13 +1123,6 @@
+@@ -1113,13 +1126,6 @@
  mocs: kasitem.moc
  
  #>+ 3
@@ -26180,7 +32927,7 @@
  kasresources.moc: $(srcdir)/kasresources.h
  	$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
  
-@@ -1179,7 +1182,7 @@
+@@ -1179,7 +1185,7 @@
  
  #>+ 3
  clean-metasources:
@@ -26189,9 +32936,17 @@
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
---- kicker/extensions/Makefile.in
-+++ kicker/extensions/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26201,16 +32956,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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 +597,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26220,11 +32984,19 @@
 -$(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/sidebar/Makefile.in
-+++ kicker/extensions/sidebar/Makefile.in
-@@ -294,6 +294,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26234,7 +33006,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26243,7 +33024,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -646,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26255,9 +33036,17 @@
  	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
-@@ -302,6 +302,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26267,7 +33056,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26276,7 +33074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -697,9 +703,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26286,11 +33084,19 @@
 -$(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-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- kicker/kicker/buttons/Makefile.in
 +++ kicker/kicker/buttons/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26300,7 +33106,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26309,7 +33124,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26321,7 +33136,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -957,11 +960,11 @@
+@@ -957,11 +963,11 @@
  mocs: servicebutton.moc
  
  #>+ 3
@@ -26336,7 +33151,7 @@
  
  #>+ 3
  servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -971,11 +974,11 @@
+@@ -971,11 +977,11 @@
  mocs: servicemenubutton.moc
  
  #>+ 3
@@ -26351,7 +33166,7 @@
  
  #>+ 3
  nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -993,10 +996,10 @@
+@@ -993,10 +999,10 @@
  
  #>+ 3
  clean-metasources:
@@ -26364,7 +33179,7 @@
  
  #>+ 2
  docs-am:
-@@ -1040,7 +1043,7 @@
+@@ -1040,7 +1046,7 @@
  
  
  #>+ 11
@@ -26373,7 +33188,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 +1082,8 @@
+@@ -1079,8 +1085,8 @@
  extensionbutton.o: extensionbutton.moc 
  urlbutton.o: urlbutton.moc 
  nonkdeappbutton.lo: nonkdeappbutton.moc 
@@ -26385,7 +33200,15 @@
  kbutton.o: kbutton.moc 
 --- kicker/kicker/core/Makefile.in
 +++ kicker/kicker/core/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26395,7 +33218,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26404,7 +33236,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -666,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26416,7 +33248,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -982,18 +985,18 @@
+@@ -982,18 +988,18 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
  
  #>+ 3
@@ -26441,7 +33273,7 @@
  
  #>+ 3
  container_applet.moc: $(srcdir)/container_applet.h
-@@ -1031,18 +1034,18 @@
+@@ -1031,18 +1037,18 @@
  mocs: pluginmanager.moc
  
  #>+ 3
@@ -26466,7 +33298,7 @@
  
  #>+ 3
  showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1059,18 +1062,18 @@
+@@ -1059,18 +1065,18 @@
  mocs: extensionmanager.moc
  
  #>+ 3
@@ -26491,7 +33323,7 @@
  
  #>+ 3
  userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1081,7 +1084,7 @@
+@@ -1081,7 +1087,7 @@
  
  #>+ 3
  clean-metasources:
@@ -26500,7 +33332,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 +1142,7 @@
+@@ -1139,7 +1145,7 @@
  
  
  #>+ 11
@@ -26509,42 +33341,17 @@
  	@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
-@@ -345,6 +345,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  $(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*) \
-@@ -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)
 --- kicker/kicker/ui/Makefile.in
 +++ kicker/kicker/ui/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26554,7 +33361,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26563,7 +33379,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -666,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26575,7 +33391,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -950,11 +953,11 @@
+@@ -950,11 +956,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
  
  #>+ 3
@@ -26590,7 +33406,7 @@
  
  #>+ 3
  exe_dlg.moc: $(srcdir)/exe_dlg.h
-@@ -964,11 +967,11 @@
+@@ -964,11 +970,11 @@
  mocs: exe_dlg.moc
  
  #>+ 3
@@ -26605,7 +33421,7 @@
  
  #>+ 3
  hidebutton.moc: $(srcdir)/hidebutton.h
-@@ -1062,18 +1065,18 @@
+@@ -1062,18 +1068,18 @@
  mocs: addappletvisualfeedback.moc
  
  #>+ 3
@@ -26630,7 +33446,7 @@
  
  #>+ 3
  addextension_mnu.moc: $(srcdir)/addextension_mnu.h
-@@ -1084,7 +1087,7 @@
+@@ -1084,7 +1090,7 @@
  
  #>+ 3
  clean-metasources:
@@ -26639,7 +33455,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am 
-@@ -1143,7 +1146,7 @@
+@@ -1143,7 +1149,7 @@
  
  
  #>+ 11
@@ -26648,7 +33464,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 +1187,7 @@
+@@ -1184,7 +1190,7 @@
  addappletvisualfeedback.o: addappletvisualfeedback.moc 
  addextension_mnu.o: addextension_mnu.moc 
  browser_dlg.lo: browser_dlg.moc 
@@ -26657,7 +33473,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 +1197,7 @@
+@@ -1194,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 
@@ -26668,7 +33484,15 @@
  $(srcdir)/removeapplet_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
 --- kicker/libkicker/Makefile.in
 +++ kicker/libkicker/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26678,7 +33502,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26687,7 +33520,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26699,7 +33532,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -957,22 +960,22 @@
+@@ -957,22 +963,22 @@
  mocs: panelbutton.moc
  
  #>+ 3
@@ -26729,7 +33562,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 +1031,7 @@
+@@ -1028,7 +1034,7 @@
  
  
  #>+ 11
@@ -26738,7 +33571,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 +1085,8 @@
+@@ -1082,8 +1088,8 @@
  simplebutton.lo: simplebutton.moc 
  $(srcdir)/simplebutton.cpp: kickerSettings.h 
  $(srcdir)/paneldrag.cpp: kickerSettings.h 
@@ -26748,9 +33581,17 @@
  
  #>+ 6
  kickerSettings.cpp: kickerSettings.h
---- kicker/Makefile.in
-+++ kicker/Makefile.in
-@@ -267,6 +267,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26760,7 +33601,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -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:
@@ -26769,7 +33619,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26783,7 +33633,15 @@
  mostlyclean-libtool:
 --- kicker/menuext/find/Makefile.in
 +++ kicker/menuext/find/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26793,7 +33651,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26802,7 +33669,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26816,7 +33683,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/kdeprint/Makefile.in
 +++ kicker/menuext/kdeprint/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26826,7 +33701,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26835,7 +33719,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26849,7 +33733,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konq-profiles/Makefile.in
 +++ kicker/menuext/konq-profiles/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26859,7 +33751,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26868,7 +33769,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26882,7 +33783,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konsole/Makefile.in
 +++ kicker/menuext/konsole/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26892,7 +33801,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26901,7 +33819,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26913,42 +33831,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/menuext/Makefile.in
-+++ kicker/menuext/Makefile.in
-@@ -266,6 +266,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@
-@@ -556,7 +559,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 +597,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
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26958,7 +33851,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26967,7 +33869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26981,7 +33883,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/recentdocs/Makefile.in
 +++ kicker/menuext/recentdocs/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26991,7 +33901,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27000,7 +33919,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27014,7 +33933,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/remote/Makefile.in
 +++ kicker/menuext/remote/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27024,7 +33951,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27033,7 +33969,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27047,7 +33983,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/system/Makefile.in
 +++ kicker/menuext/system/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27057,7 +34001,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27066,7 +34019,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27080,7 +34033,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/tom/Makefile.in
 +++ kicker/menuext/tom/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27090,7 +34051,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -27099,7 +34069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27113,7 +34083,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/proxy/Makefile.in
 +++ kicker/proxy/Makefile.in
-@@ -327,6 +327,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27123,7 +34101,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27132,7 +34119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27144,7 +34131,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1060,18 +1063,18 @@
+@@ -1060,18 +1066,18 @@
  extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
  
  #>+ 3
@@ -27169,7 +34156,7 @@
  
  #>+ 3
  extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1082,7 +1085,7 @@
+@@ -1082,7 +1088,7 @@
  
  #>+ 3
  clean-metasources:
@@ -27180,7 +34167,15 @@
  KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am 
 --- kicker/taskbar/Makefile.in
 +++ kicker/taskbar/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27190,7 +34185,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27199,7 +34203,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27213,7 +34217,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/taskmanager/Makefile.in
 +++ kicker/taskmanager/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27223,7 +34235,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27232,7 +34253,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27244,9 +34265,67 @@
  	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
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27256,7 +34335,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27265,7 +34353,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27277,9 +34365,17 @@
  	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
-@@ -296,6 +296,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27289,7 +34385,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27298,7 +34403,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27310,9 +34415,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/cgi/Makefile.in
-+++ kioslave/cgi/Makefile.in
-@@ -310,6 +310,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27322,7 +34435,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27331,7 +34453,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27345,7 +34467,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/filter/Makefile.in
 +++ kioslave/filter/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27355,7 +34485,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -27364,7 +34503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27378,7 +34517,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/finger/Makefile.in
 +++ kioslave/finger/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27388,7 +34535,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27397,7 +34553,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27411,7 +34567,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/fish/Makefile.in
 +++ kioslave/fish/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27421,7 +34585,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27430,7 +34603,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27444,7 +34617,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/floppy/Makefile.in
 +++ kioslave/floppy/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -27454,7 +34635,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27463,7 +34653,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27475,9 +34665,17 @@
  	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
-@@ -298,6 +298,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27487,7 +34685,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27496,7 +34703,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -667,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27508,9 +34715,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/home/Makefile.in
-+++ kioslave/home/Makefile.in
-@@ -323,6 +323,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27520,7 +34735,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27529,7 +34753,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27543,7 +34767,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/info/Makefile.in
 +++ kioslave/info/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27553,7 +34785,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -27562,7 +34803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27576,7 +34817,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/ldap/Makefile.in
 +++ kioslave/ldap/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -27586,7 +34835,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27595,7 +34853,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27609,7 +34867,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/mac/Makefile.in
 +++ kioslave/mac/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27619,7 +34885,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27628,7 +34903,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27640,7 +34915,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -952,14 +955,14 @@
+@@ -952,14 +958,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -27658,9 +34933,17 @@
  
  #>+ 15
  force-reedit:
---- kioslave/Makefile.in
-+++ kioslave/Makefile.in
-@@ -268,6 +268,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27670,16 +34953,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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*) \
-@@ -601,9 +604,9 @@
+@@ -675,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27689,11 +34981,19 @@
 -$(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/man/Makefile.in
-+++ kioslave/man/Makefile.in
-@@ -320,6 +320,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27703,7 +35003,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -637,7 +640,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27712,7 +35021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -675,9 +678,9 @@
+@@ -671,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27726,7 +35035,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/kcmodule/Makefile.in
 +++ kioslave/media/kcmodule/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27736,7 +35053,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27745,7 +35071,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27759,7 +35085,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/kfile-plugin/Makefile.in
 +++ kioslave/media/kfile-plugin/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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@
@@ -27769,7 +35103,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27778,7 +35121,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27792,7 +35135,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/libmediacommon/Makefile.in
 +++ kioslave/media/libmediacommon/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27802,7 +35153,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27811,7 +35171,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27823,42 +35183,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
---- kioslave/media/Makefile.in
-+++ kioslave/media/Makefile.in
-@@ -324,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@
-@@ -633,7 +636,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*) \
-@@ -671,9 +674,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
-@@ -333,6 +333,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27868,7 +35203,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -642,7 +645,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27877,7 +35221,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -680,9 +683,9 @@
+@@ -680,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27889,7 +35233,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1032,7 +1035,7 @@
+@@ -1032,7 +1038,7 @@
  	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
  
  #>+ 2
@@ -27900,7 +35244,15 @@
  clean-idl:
 --- kioslave/media/medianotifier/Makefile.in
 +++ kioslave/media/medianotifier/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27910,7 +35262,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27919,7 +35280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27933,7 +35294,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/mimetypes/Makefile.in
 +++ kioslave/media/mimetypes/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -27943,7 +35312,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27952,7 +35330,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27966,7 +35344,15 @@
  mostlyclean-libtool:
 --- kioslave/media/mounthelper/Makefile.in
 +++ kioslave/media/mounthelper/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27976,7 +35362,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27985,7 +35380,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27999,7 +35394,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/services/Makefile.in
 +++ kioslave/media/services/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -28009,7 +35412,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -28018,7 +35430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28032,7 +35444,15 @@
  mostlyclean-libtool:
 --- kioslave/nfs/Makefile.in
 +++ kioslave/nfs/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28042,7 +35462,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -28051,7 +35480,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28065,7 +35494,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/nntp/Makefile.in
 +++ kioslave/nntp/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28075,7 +35512,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28084,7 +35530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28098,7 +35544,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/pop3/Makefile.in
 +++ kioslave/pop3/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28108,7 +35562,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28117,7 +35580,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28129,9 +35592,17 @@
  	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
-@@ -299,6 +299,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28141,7 +35612,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28150,7 +35630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -667,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28162,9 +35642,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/remote/Makefile.in
-+++ kioslave/remote/Makefile.in
-@@ -323,6 +323,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28174,7 +35662,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28183,7 +35680,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28197,7 +35694,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/settings/Makefile.in
 +++ kioslave/settings/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28207,7 +35712,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28216,7 +35730,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28230,7 +35744,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/sftp/Makefile.in
 +++ kioslave/sftp/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28240,7 +35762,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28249,7 +35780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28263,7 +35794,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smb/Makefile.in
 +++ kioslave/smb/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28273,7 +35812,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28282,7 +35830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28296,7 +35844,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smtp/Makefile.in
 +++ kioslave/smtp/Makefile.in
-@@ -329,6 +329,9 @@
+@@ -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@
@@ -28306,7 +35862,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -641,7 +644,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28315,7 +35880,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +682,9 @@
+@@ -679,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28327,9 +35892,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/system/entries/Makefile.in
-+++ kioslave/system/entries/Makefile.in
-@@ -263,6 +263,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28339,16 +35912,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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 +596,9 @@
+@@ -666,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28358,11 +35940,19 @@
 -$(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
-@@ -299,6 +299,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28372,16 +35962,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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
  
  .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*) \
-@@ -637,9 +640,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28391,11 +35990,19 @@
 -$(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/Makefile.in
-+++ kioslave/system/Makefile.in
-@@ -323,6 +323,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28405,7 +36012,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28414,7 +36030,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28428,7 +36044,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/mimetypes/Makefile.in
 +++ kioslave/system/mimetypes/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -28438,7 +36062,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -28447,7 +36080,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28461,7 +36094,15 @@
  mostlyclean-libtool:
 --- kioslave/tar/Makefile.in
 +++ kioslave/tar/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28471,7 +36112,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -28480,7 +36130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28494,7 +36144,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/thumbnail/Makefile.in
 +++ kioslave/thumbnail/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28504,7 +36162,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -678,7 +681,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28513,7 +36180,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -716,9 +719,9 @@
+@@ -716,9 +722,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28525,9 +36192,17 @@
  	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
-@@ -294,6 +294,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28537,7 +36212,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28546,7 +36230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -676,9 +682,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28558,9 +36242,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/trash/Makefile.in
-+++ kioslave/trash/Makefile.in
-@@ -329,6 +329,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28570,7 +36262,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -638,7 +641,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28579,7 +36280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -676,9 +679,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28593,7 +36294,15 @@
  	@$(NORMAL_INSTALL)
 --- klipper/Makefile.in
 +++ klipper/Makefile.in
-@@ -347,6 +347,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28603,7 +36312,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -677,7 +680,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28612,7 +36330,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -715,9 +718,9 @@
+@@ -715,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28624,7 +36342,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1251,18 +1254,18 @@
+@@ -1251,18 +1257,18 @@
  mocs: history.moc
  
  #>+ 3
@@ -28649,7 +36367,7 @@
  
  #>+ 3
  clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1301,7 +1304,7 @@
+@@ -1301,7 +1307,7 @@
  
  #>+ 3
  clean-metasources:
@@ -28658,7 +36376,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 +1320,29 @@
+@@ -1317,29 +1323,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -28697,7 +36415,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1392,7 +1395,7 @@
+@@ -1392,7 +1398,7 @@
  	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
  
  #>+ 11
@@ -28708,7 +36426,15 @@
  	echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
 --- kmenuedit/Makefile.in
 +++ kmenuedit/Makefile.in
-@@ -354,6 +354,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28718,7 +36444,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -678,7 +681,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28727,7 +36462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -716,9 +719,9 @@
+@@ -716,9 +722,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28739,7 +36474,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1311,20 +1314,20 @@
+@@ -1311,20 +1317,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -28768,7 +36503,15 @@
  force-reedit:
 --- kmenuedit/pixmaps/Makefile.in
 +++ kmenuedit/pixmaps/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28778,7 +36521,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28787,7 +36539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28799,7 +36551,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,34 +736,34 @@
+@@ -733,34 +739,34 @@
  
  #>+ 30
  install-kde-icons:
@@ -28852,7 +36604,15 @@
  force-reedit:
 --- knetattach/Makefile.in
 +++ knetattach/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28862,7 +36622,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28871,7 +36640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28883,7 +36652,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -914,7 +917,7 @@
+@@ -914,7 +920,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -28892,7 +36661,7 @@
  
  #>+ 4
  clean-ui:
-@@ -926,29 +929,29 @@
+@@ -926,29 +932,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -28934,9 +36703,132 @@
  
  #>+ 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
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28946,7 +36838,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28955,7 +36856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28969,7 +36870,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/client/Makefile.in
 +++ konqueror/client/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28979,7 +36888,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28988,7 +36906,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -665,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29002,7 +36920,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/iconview/Makefile.in
 +++ konqueror/iconview/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29012,7 +36938,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -29021,7 +36956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29035,7 +36970,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/keditbookmarks/Makefile.in
 +++ konqueror/keditbookmarks/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29045,7 +36988,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29054,7 +37006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -673,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29066,7 +37018,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1128,18 +1131,18 @@
+@@ -1128,18 +1134,18 @@
  mocs: updater.moc
  
  #>+ 3
@@ -29091,7 +37043,7 @@
  
  #>+ 3
  bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1149,11 +1152,11 @@
+@@ -1149,11 +1155,11 @@
  mocs: bookmarkinfo.moc
  
  #>+ 3
@@ -29106,7 +37058,7 @@
  
  #>+ 3
  dcop.moc: $(srcdir)/dcop.h
-@@ -1163,18 +1166,18 @@
+@@ -1163,18 +1169,18 @@
  mocs: dcop.moc
  
  #>+ 3
@@ -29130,7 +37082,7 @@
  
  #>+ 5
  clean-idl:
-@@ -1192,20 +1195,20 @@
+@@ -1192,20 +1198,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -29157,7 +37109,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1246,7 +1249,7 @@
+@@ -1246,7 +1252,7 @@
  
  
  #>+ 11
@@ -29168,7 +37120,15 @@
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
 --- konqueror/kttsplugin/Makefile.in
 +++ konqueror/kttsplugin/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29178,7 +37138,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29187,7 +37156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29201,7 +37170,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/listview/Makefile.in
 +++ konqueror/listview/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29211,7 +37188,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -29220,7 +37206,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29232,9 +37218,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- konqueror/Makefile.in
-+++ konqueror/Makefile.in
-@@ -363,6 +363,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29244,16 +37238,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -729,7 +732,7 @@
+@@ -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
  
  .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 +770,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29263,76 +37266,78 @@
 -$(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 +1484,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
+ mostlyclean-libtool:
+@@ -895,39 +901,39 @@
  
-@@ -1495,11 +1505,11 @@
- mocs: konq_browseriface.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
  
- #>+ 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
+ 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
  
- #>+ 2
--mocs: konq_tabs.moc
-+mocs: konq_view.moc
- 
- #>+ 3
- konq_run.moc: $(srcdir)/konq_run.h
-@@ -1509,13 +1519,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 +1557,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 +1620,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; \
+ #>+ 15
+ force-reedit:
 --- konqueror/pics/actions/Makefile.in
 +++ konqueror/pics/actions/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29342,7 +37347,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -29351,7 +37365,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29363,7 +37377,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,20 +735,20 @@
+@@ -732,20 +738,20 @@
  #>+ 17
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
@@ -29390,7 +37404,15 @@
  force-reedit:
 --- konqueror/pics/indicators/Makefile.in
 +++ konqueror/pics/indicators/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -29400,7 +37422,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29409,7 +37440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29421,101 +37452,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/pics/Makefile.in
-+++ konqueror/pics/Makefile.in
-@@ -266,6 +266,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,7 +560,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*) \
-@@ -595,9 +598,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:
-@@ -895,39 +898,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
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -29525,7 +37472,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29534,7 +37490,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29548,7 +37504,15 @@
  mostlyclean-libtool:
 --- konqueror/preloader/Makefile.in
 +++ konqueror/preloader/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29558,7 +37522,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -29567,7 +37540,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29581,7 +37554,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/quickprint/Makefile.in
 +++ konqueror/quickprint/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -29591,7 +37572,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29600,7 +37590,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29612,7 +37602,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +760,7 @@
+@@ -757,7 +763,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -29623,7 +37613,15 @@
  docs-am:
 --- konqueror/remoteencodingplugin/Makefile.in
 +++ konqueror/remoteencodingplugin/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29633,7 +37631,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29642,7 +37649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29656,7 +37663,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/shellcmdplugin/Makefile.in
 +++ konqueror/shellcmdplugin/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29666,7 +37681,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29675,7 +37699,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29689,7 +37713,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/Makefile.in
 +++ konqueror/sidebar/Makefile.in
-@@ -338,6 +338,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29699,7 +37731,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -666,7 +669,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29708,7 +37749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -704,9 +707,9 @@
+@@ -704,9 +710,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29722,7 +37763,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/test/Makefile.in
 +++ konqueror/sidebar/test/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29732,7 +37781,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29741,7 +37799,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -662,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29753,9 +37811,67 @@
  	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
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29765,7 +37881,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29774,7 +37899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29788,7 +37913,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/dirtree_module/Makefile.in
 +++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29798,7 +37931,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29807,7 +37949,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29821,7 +37963,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/history_module/Makefile.in
 +++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29831,7 +37981,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29840,7 +37999,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -656,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29854,7 +38013,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/init/Makefile.in
 +++ konqueror/sidebar/trees/init/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29864,7 +38031,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29873,7 +38049,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29885,9 +38061,17 @@
  	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
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29897,8 +38081,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -29906,7 +38099,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -606,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29918,9 +38111,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/sidebar/trees/init/remote/Makefile.in
-+++ konqueror/sidebar/trees/init/remote/Makefile.in
-@@ -276,6 +276,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29930,8 +38131,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -29939,7 +38149,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29953,7 +38163,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/remote/web/Makefile.in
 +++ konqueror/sidebar/trees/init/remote/web/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -29963,7 +38181,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -29972,7 +38199,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29986,7 +38213,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/services/Makefile.in
 +++ konqueror/sidebar/trees/init/services/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -29996,7 +38231,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30005,7 +38249,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30017,9 +38261,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/sidebar/trees/Makefile.in
-+++ konqueror/sidebar/trees/Makefile.in
-@@ -317,6 +317,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30029,7 +38281,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30038,7 +38299,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30050,9 +38311,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- konqueror/sidebar/web_module/Makefile.in
-+++ konqueror/sidebar/web_module/Makefile.in
-@@ -296,6 +296,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30062,16 +38331,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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
  
  .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*) \
-@@ -637,9 +640,9 @@
+@@ -636,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30081,11 +38359,19 @@
 -$(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-updateSCRIPTS: $(update_SCRIPTS)
  	@$(NORMAL_INSTALL)
 --- konsole/doc/Makefile.in
 +++ konsole/doc/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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@
@@ -30095,7 +38381,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30104,7 +38399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30118,7 +38413,15 @@
  mostlyclean-libtool:
 --- konsole/doc/VT100/Makefile.in
 +++ konsole/doc/VT100/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30128,7 +38431,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30137,7 +38449,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30151,7 +38463,15 @@
  mostlyclean-libtool:
 --- konsole/fonts/Makefile.in
 +++ konsole/fonts/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -30161,7 +38481,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30170,7 +38499,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30184,7 +38513,15 @@
  mostlyclean-libtool:
 --- konsole/konsole/Makefile.in
 +++ konsole/konsole/Makefile.in
-@@ -356,6 +356,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30194,7 +38531,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -725,7 +728,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30203,7 +38549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -763,9 +766,9 @@
+@@ -763,9 +769,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30215,7 +38561,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1241,18 +1244,18 @@
+@@ -1241,18 +1247,18 @@
  mocs: TEWidget.moc
  
  #>+ 3
@@ -30240,7 +38586,7 @@
  
  #>+ 3
  konsole.moc: $(srcdir)/konsole.h
-@@ -1297,18 +1300,18 @@
+@@ -1297,18 +1303,18 @@
  mocs: konsole_part.moc
  
  #>+ 3
@@ -30265,7 +38611,7 @@
  
  #>+ 5
  kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1327,7 +1330,7 @@
+@@ -1327,7 +1333,7 @@
  
  #>+ 3
  clean-metasources:
@@ -30274,7 +38620,7 @@
  
  #>+ 2
  KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am 
-@@ -1387,7 +1390,7 @@
+@@ -1387,7 +1393,7 @@
  
  
  #>+ 11
@@ -30283,7 +38629,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 +1468,8 @@
+@@ -1465,8 +1471,8 @@
  	@rm -f konsole$(EXEEXT)
  	$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
  
@@ -30293,9 +38639,17 @@
  konsole_part.o: konsole_part.moc 
  konsolebookmarkhandler.o: konsolebookmarkhandler.moc 
  nmcheck-am: nmcheck
---- konsole/Makefile.in
-+++ konsole/Makefile.in
-@@ -293,6 +293,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30305,7 +38659,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -30314,7 +38677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -622,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30324,11 +38687,61 @@
 -$(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)
- 	@$(NORMAL_INSTALL)
+ 
+ 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:
 --- konsole/other/icons/Makefile.in
 +++ konsole/other/icons/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30338,7 +38751,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30347,7 +38769,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30359,7 +38781,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -724,7 +727,7 @@
+@@ -724,7 +730,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -30368,7 +38790,7 @@
  
  #>+ 2
  docs-am:
-@@ -732,37 +735,37 @@
+@@ -732,37 +738,37 @@
  #>+ 35
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
@@ -30423,84 +38845,17 @@
  	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
  
  #>+ 15
---- konsole/other/Makefile.in
-+++ konsole/other/Makefile.in
-@@ -278,6 +278,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@
-@@ -584,7 +587,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*) \
-@@ -622,9 +625,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:
-@@ -963,29 +966,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
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -30510,7 +38865,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30519,7 +38883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30533,7 +38897,15 @@
  mostlyclean-libtool:
 --- kpager/Makefile.in
 +++ kpager/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30543,7 +38915,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30552,7 +38933,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30564,7 +38945,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -968,20 +971,20 @@
+@@ -968,20 +974,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -30593,7 +38974,15 @@
  force-reedit:
 --- kpersonalizer/Makefile.in
 +++ kpersonalizer/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30603,7 +38992,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30612,7 +39010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -682,9 +688,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30624,7 +39022,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1107,18 +1110,18 @@
+@@ -1107,18 +1113,18 @@
  mocs: krefinepage.moc
  
  #>+ 3
@@ -30649,7 +39047,7 @@
  
  #>+ 3
  kospage.moc: $(srcdir)/kospage.h
-@@ -1129,7 +1132,7 @@
+@@ -1129,7 +1135,7 @@
  
  #>+ 3
  clean-metasources:
@@ -30658,7 +39056,7 @@
  
  #>+ 2
  KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am 
-@@ -1149,14 +1152,14 @@
+@@ -1149,14 +1155,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -30678,7 +39076,15 @@
  force-reedit:
 --- kpersonalizer/pics/Makefile.in
 +++ kpersonalizer/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -30688,7 +39094,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -30697,7 +39112,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30711,7 +39126,15 @@
  mostlyclean-libtool:
 --- kreadconfig/Makefile.in
 +++ kreadconfig/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30721,7 +39144,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30730,7 +39162,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30744,7 +39176,15 @@
  	@$(NORMAL_INSTALL)
 --- kscreensaver/Makefile.in
 +++ kscreensaver/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30754,7 +39194,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30763,7 +39212,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30796,7 +39245,15 @@
  	../kdmlib/libdmctl.la
  updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(update_SCRIPTS)
-@@ -356,6 +357,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30806,7 +39263,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -646,15 +650,20 @@
+@@ -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
@@ -30831,7 +39297,7 @@
  ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
  #>- ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI)
  #>+ 1
-@@ -666,14 +675,14 @@
+@@ -666,14 +678,14 @@
  updatedir = $(kde_datadir)/kconf_update
  testsh_SOURCES = test.cpp
  testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -30848,7 +39314,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -711,9 +720,9 @@
+@@ -711,9 +723,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30860,7 +39326,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -828,9 +837,13 @@
+@@ -828,9 +840,13 @@
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -30874,7 +39340,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test.Po at am__quote@
  
  .cpp.o:
-@@ -1206,8 +1219,9 @@
+@@ -1206,8 +1222,9 @@
  libkdeinit_ksmserver_la_DEPENDENCIES = ../kdmlib/libdmctl.la \
  	$(am__DEPENDENCIES_1)
  
@@ -30886,7 +39352,7 @@
  
  #>+ 13
  
-@@ -1234,11 +1248,11 @@
+@@ -1234,11 +1251,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub server.kidl
  
  #>+ 3
@@ -30901,7 +39367,7 @@
  
  #>+ 3
  server.moc: $(srcdir)/server.h
-@@ -1249,10 +1263,10 @@
+@@ -1249,10 +1266,10 @@
  
  #>+ 3
  clean-metasources:
@@ -30914,7 +39380,7 @@
  
  #>+ 5
  clean-idl:
-@@ -1302,11 +1316,11 @@
+@@ -1302,11 +1319,11 @@
  
  
  #>+ 11
@@ -30928,7 +39394,7 @@
  	  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 +1331,10 @@
+@@ -1317,9 +1334,10 @@
  clean-final:
  	-rm -f libkdeinit_ksmserver_la.all_cpp.cpp
  
@@ -30941,7 +39407,7 @@
  @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 +1363,15 @@
+@@ -1348,15 +1366,15 @@
  
  #>+ 14
  nmcheck: 
@@ -30959,9 +39425,67 @@
  
 -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
-@@ -313,6 +313,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30971,7 +39495,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30980,7 +39513,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30994,7 +39527,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/kcmksplash/pics/Makefile.in
 +++ ksplashml/kcmksplash/pics/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31004,7 +39545,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31013,7 +39563,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31025,7 +39575,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,26 +733,26 @@
+@@ -730,26 +736,26 @@
  
  #>+ 22
  install-kde-icons:
@@ -31061,42 +39611,17 @@
  
  #>+ 15
  force-reedit:
---- ksplashml/Makefile.in
-+++ ksplashml/Makefile.in
-@@ -315,6 +315,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@
-@@ -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*) \
-@@ -654,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)
 --- ksplashml/pics/Makefile.in
 +++ ksplashml/pics/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31106,7 +39631,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31115,7 +39649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31127,9 +39661,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/blue-bend/Makefile.in
-+++ ksplashml/pics/themes/blue-bend/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31139,8 +39681,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -31148,7 +39699,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -596,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31160,9 +39711,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/default/locolor/Makefile.in
-+++ ksplashml/pics/themes/default/locolor/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31172,7 +39731,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -31181,7 +39749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31195,7 +39763,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/default/Makefile.in
 +++ ksplashml/pics/themes/default/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31205,7 +39781,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -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 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31214,7 +39799,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31226,9 +39811,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/Makefile.in
-+++ ksplashml/pics/themes/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31238,8 +39831,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
- all: docs-am  all-recursive
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -31247,7 +39849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31261,7 +39863,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/none/Makefile.in
 +++ ksplashml/pics/themes/none/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -31271,7 +39881,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -31280,7 +39899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31294,7 +39913,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/simple/Makefile.in
 +++ ksplashml/pics/themes/simple/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -31304,7 +39931,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -31313,7 +39949,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31325,9 +39961,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/themeengine/default/Makefile.in
-+++ ksplashml/themeengine/default/Makefile.in
-@@ -301,6 +301,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31337,7 +39981,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31346,7 +39999,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -655,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31356,11 +40009,19 @@
 -$(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/Makefile.in
-+++ ksplashml/themeengine/Makefile.in
-@@ -317,6 +317,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31370,7 +40031,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31379,7 +40049,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31389,11 +40059,19 @@
 -$(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/redmond/Makefile.in
 +++ ksplashml/themeengine/redmond/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -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@
@@ -31403,7 +40081,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31412,7 +40099,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31426,7 +40113,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/redmond/pics/Makefile.in
 +++ ksplashml/themeengine/redmond/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -31436,7 +40131,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -31445,7 +40149,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31459,7 +40163,15 @@
  mostlyclean-libtool:
 --- ksplashml/themeengine/simple/Makefile.in
 +++ ksplashml/themeengine/simple/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31469,7 +40181,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31478,7 +40199,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31492,7 +40213,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/Makefile.in
 +++ ksplashml/themeengine/standard/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31502,7 +40231,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31511,7 +40249,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31525,7 +40263,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/pics/Makefile.in
 +++ ksplashml/themeengine/standard/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -31535,7 +40281,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -31544,7 +40299,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31558,7 +40313,15 @@
  mostlyclean-libtool:
 --- kstart/Makefile.in
 +++ kstart/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31568,7 +40331,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31577,7 +40349,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31591,7 +40363,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/CContLib/Makefile.in
 +++ ksysguard/CContLib/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31601,7 +40381,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -31610,7 +40399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31622,9 +40411,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/example/Makefile.in
-+++ ksysguard/example/Makefile.in
-@@ -262,6 +262,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31634,8 +40431,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
- all: docs-am  all-am
+@@ -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
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -31643,7 +40449,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -598,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31655,9 +40461,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksysguard/gui/ksgrd/Makefile.in
-+++ ksysguard/gui/ksgrd/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31667,16 +40514,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -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
  
  .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*) \
-@@ -663,9 +666,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31686,72 +40542,19 @@
 -$(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 +971,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 +978,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 +992,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 +1014,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 +1065,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; \
+ mostlyclean-libtool:
 --- ksysguard/gui/Makefile.in
 +++ ksysguard/gui/Makefile.in
-@@ -355,6 +355,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31761,7 +40564,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -700,7 +703,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -31770,7 +40582,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -738,9 +741,9 @@
+@@ -738,9 +744,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31784,7 +40596,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/gui/SensorDisplayLib/Makefile.in
 +++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31794,7 +40614,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -650,7 +653,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -31803,7 +40632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +691,9 @@
+@@ -688,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31815,7 +40644,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -949,18 +952,18 @@
+@@ -949,18 +955,18 @@
  
  
  #>+ 3
@@ -31840,7 +40669,7 @@
  
  #>+ 3
  DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -1012,18 +1015,18 @@
+@@ -1012,18 +1018,18 @@
  mocs: ListView.moc
  
  #>+ 3
@@ -31865,7 +40694,7 @@
  
  #>+ 3
  DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1083,7 +1086,7 @@
+@@ -1083,7 +1089,7 @@
  
  #>+ 3
  clean-metasources:
@@ -31874,7 +40703,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 +1146,7 @@
+@@ -1143,7 +1149,7 @@
  
  
  #>+ 11
@@ -31883,9 +40712,17 @@
  	@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/ksysguardd/FreeBSD/Makefile.in
-+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -282,6 +282,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31895,16 +40732,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -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 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .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*) \
-@@ -615,9 +618,9 @@
+@@ -663,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31914,11 +40760,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)
+@@ -968,13 +974,6 @@
+ mocs: SensorSocketAgent.moc
  
- clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Irix/Makefile.in
-+++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -277,6 +277,9 @@
+ #>+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31928,7 +40843,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -31937,7 +40861,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -615,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31949,9 +40873,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Linux/Makefile.in
-+++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -283,6 +283,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31961,7 +40893,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -31970,7 +40911,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -608,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31982,9 +40923,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Makefile.in
-+++ ksysguard/ksysguardd/Makefile.in
-@@ -296,6 +296,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31994,7 +40943,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32003,7 +40961,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -621,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32013,11 +40971,19 @@
 -$(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
-@@ -282,6 +282,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32027,7 +40993,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32036,7 +41011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -640,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32046,11 +41021,19 @@
 -$(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/OpenBSD/Makefile.in
-+++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -275,6 +275,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32060,7 +41043,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32069,7 +41061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -615,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32081,9 +41073,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Solaris/Makefile.in
-+++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -283,6 +283,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32093,7 +41093,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32102,7 +41111,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -607,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32114,9 +41123,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Tru64/Makefile.in
-+++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -285,6 +285,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32126,7 +41143,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -32135,7 +41161,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -614,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32145,11 +41171,19 @@
 -$(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)
---- ksysguard/Makefile.in
-+++ ksysguard/Makefile.in
-@@ -266,6 +266,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32159,16 +41193,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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*) \
-@@ -598,9 +601,9 @@
+@@ -620,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32178,44 +41221,19 @@
 -$(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,23 +901,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:
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- ksysguard/pics/Makefile.in
 +++ ksysguard/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -32225,7 +41243,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -32234,7 +41261,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32248,7 +41275,15 @@
  mostlyclean-libtool:
 --- ksystraycmd/Makefile.in
 +++ ksystraycmd/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32258,7 +41293,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32267,7 +41311,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32281,7 +41325,15 @@
  	@$(NORMAL_INSTALL)
 --- ktip/Makefile.in
 +++ ktip/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32291,7 +41343,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32300,7 +41361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32312,7 +41373,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1085,29 +1088,29 @@
+@@ -1085,29 +1091,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -32353,7 +41414,15 @@
  force-reedit:
 --- ktip/pics/Makefile.in
 +++ ktip/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -32363,7 +41432,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -32372,7 +41450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32384,9 +41462,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kwin/clients/b2/config/Makefile.in
-+++ kwin/clients/b2/config/Makefile.in
-@@ -292,6 +292,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32396,16 +41482,215 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -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 @@
  
  .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*) \
-@@ -628,9 +631,9 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32415,11 +41700,19 @@
 -$(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/clients/b2/Makefile.in
 +++ kwin/clients/b2/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32429,7 +41722,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32438,7 +41740,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32450,9 +41752,17 @@
  	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
-@@ -292,6 +292,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32462,7 +41772,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32471,7 +41790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32485,7 +41804,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/default/Makefile.in
 +++ kwin/clients/default/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32495,7 +41822,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32504,7 +41840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32516,9 +41852,17 @@
  	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
-@@ -295,6 +295,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32528,7 +41872,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32537,7 +41890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -628,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32551,7 +41904,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/keramik/Makefile.in
 +++ kwin/clients/keramik/Makefile.in
-@@ -318,6 +318,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32561,7 +41922,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32570,7 +41940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -663,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32582,9 +41952,17 @@
  	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
-@@ -284,6 +284,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32594,7 +41972,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32603,7 +41990,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -633,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32613,11 +42000,19 @@
 -$(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/kwmtheme/Makefile.in
 +++ kwin/clients/kwmtheme/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32627,7 +42022,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32636,7 +42040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32648,9 +42052,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/laptop/Makefile.in
-+++ kwin/clients/laptop/Makefile.in
-@@ -294,6 +294,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32660,7 +42072,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32669,7 +42090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -625,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32679,11 +42100,19 @@
 -$(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/Makefile.in
-+++ kwin/clients/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32693,16 +42122,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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 +597,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32712,11 +42150,19 @@
 -$(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/clients/modernsystem/config/Makefile.in
-+++ kwin/clients/modernsystem/config/Makefile.in
-@@ -293,6 +293,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32726,7 +42172,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32735,7 +42190,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -647,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32747,9 +42202,17 @@
  	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
-@@ -308,6 +308,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32759,7 +42222,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32768,7 +42240,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -629,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32780,9 +42252,17 @@
  	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
-@@ -295,6 +295,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32792,7 +42272,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32801,7 +42290,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -652,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32813,9 +42302,17 @@
  	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
-@@ -312,6 +312,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32825,7 +42322,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32834,7 +42340,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32846,9 +42352,17 @@
  	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
-@@ -292,6 +292,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32858,7 +42372,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32867,7 +42390,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -649,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32879,9 +42402,17 @@
  	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
-@@ -310,6 +310,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32891,7 +42422,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32900,7 +42440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -628,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32914,7 +42454,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/redmond/Makefile.in
 +++ kwin/clients/redmond/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32924,7 +42472,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32933,7 +42490,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32947,7 +42504,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/test/Makefile.in
 +++ kwin/clients/test/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32957,7 +42522,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32966,7 +42540,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32980,7 +42554,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/web/Makefile.in
 +++ kwin/clients/web/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32990,7 +42572,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32999,7 +42590,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33013,7 +42604,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/data/Makefile.in
 +++ kwin/data/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33023,7 +42622,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33032,7 +42640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33044,9 +42652,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kwin/kcmkwin/kwindecoration/Makefile.in
-+++ kwin/kcmkwin/kwindecoration/Makefile.in
-@@ -302,6 +302,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33056,16 +42672,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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:
- .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 @@
+@@ -594,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33075,11 +42700,19 @@
 -$(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/kcmkwin/kwinoptions/Makefile.in
-+++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -301,6 +301,9 @@
+ 
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33089,7 +42722,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33098,7 +42740,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33110,9 +42752,17 @@
  	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
-@@ -331,6 +331,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33122,7 +42772,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -655,7 +658,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33131,7 +42790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -693,9 +696,9 @@
+@@ -641,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33143,9 +42802,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/kcmkwin/Makefile.in
-+++ kwin/kcmkwin/Makefile.in
-@@ -266,6 +266,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33155,16 +42822,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
- all: docs-am  all-recursive
+@@ -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 @@
  
  .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 +597,9 @@
+@@ -693,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33174,11 +42850,19 @@
 -$(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/killer/Makefile.in
 +++ kwin/killer/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33188,7 +42872,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33197,7 +42890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33211,7 +42904,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kompmgr/Makefile.in
 +++ kwin/kompmgr/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33221,7 +42922,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -33230,7 +42940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -606,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33244,7 +42954,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/lib/Makefile.in
 +++ kwin/lib/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33254,7 +42972,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33263,7 +42990,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33275,182 +43002,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/Makefile.in
-+++ kwin/Makefile.in
-@@ -334,6 +334,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@
-@@ -656,7 +659,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 +697,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 +1336,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 +1408,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 +1459,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 +1512,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
-@@ -263,6 +263,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33460,7 +43022,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33469,7 +43040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33483,7 +43054,15 @@
  mostlyclean-libtool:
 --- kwin/pics/Makefile.in
 +++ kwin/pics/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -33493,7 +43072,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -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:
@@ -33502,7 +43090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33514,7 +43102,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -755,7 +758,7 @@
+@@ -755,7 +761,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -33523,9 +43111,17 @@
  
  #>+ 2
  docs-am:
---- kwin/tools/decobenchmark/Makefile.in
-+++ kwin/tools/decobenchmark/Makefile.in
-@@ -284,6 +284,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33535,7 +43131,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33544,7 +43149,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -630,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33556,9 +43161,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
---- kwin/tools/Makefile.in
-+++ kwin/tools/Makefile.in
-@@ -296,6 +296,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33568,7 +43181,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33577,7 +43199,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -617,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33591,7 +43213,15 @@
  clean-noinstPROGRAMS:
 --- kxkb/Makefile.in
 +++ kxkb/Makefile.in
-@@ -336,6 +336,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33601,7 +43231,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -658,7 +661,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33610,7 +43249,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -696,9 +699,9 @@
+@@ -696,9 +702,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33624,7 +43263,15 @@
  	@$(NORMAL_INSTALL)
 --- kxkb/pics/Makefile.in
 +++ kxkb/pics/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33634,7 +43281,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33643,7 +43299,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33655,7 +43311,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,15 +735,15 @@
+@@ -732,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
@@ -33676,7 +43332,15 @@
  force-reedit:
 --- l10n/Makefile.in
 +++ l10n/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33686,7 +43350,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33695,7 +43368,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33707,7 +43380,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -772,7 +775,7 @@
+@@ -772,7 +778,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -33716,42 +43389,17 @@
  
  #>+ 2
  docs-am:
---- libkonq/favicons/Makefile.in
-+++ libkonq/favicons/Makefile.in
-@@ -301,6 +301,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@
-@@ -604,7 +607,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*) \
-@@ -642,9 +645,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
-@@ -354,6 +354,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33761,7 +43409,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -695,7 +698,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -33770,7 +43427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -733,9 +736,9 @@
+@@ -733,9 +739,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33782,7 +43439,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1359,18 +1362,18 @@
+@@ -1359,18 +1365,18 @@
  mocs: knewmenu.moc
  
  #>+ 3
@@ -33807,7 +43464,7 @@
  
  #>+ 3
  konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1425,7 +1428,7 @@
+@@ -1425,7 +1431,7 @@
  
  #>+ 3
  clean-metasources:
@@ -33816,7 +43473,7 @@
  
  #>+ 2
  KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am 
-@@ -1483,7 +1486,7 @@
+@@ -1483,7 +1489,7 @@
  
  
  #>+ 11
@@ -33825,7 +43482,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 +1527,8 @@
+@@ -1524,8 +1530,8 @@
  konq_bgnddlg.o: konq_bgnddlg.moc 
  konq_bgnddlg.lo: konq_bgnddlg.moc 
  konq_faviconmgr.lo: konq_faviconmgr.moc 
@@ -33835,9 +43492,17 @@
  konq_filetip.lo: konq_filetip.moc 
  konq_drag.lo: konq_drag.moc 
  konq_popupmenu.o: konq_popupmenu.moc 
---- libkonq/pics/Makefile.in
-+++ libkonq/pics/Makefile.in
-@@ -260,6 +260,9 @@
+--- 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33847,16 +43512,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
- all: docs-am  all-am
+@@ -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 @@
  
  .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 +592,9 @@
+@@ -642,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33866,11 +43540,19 @@
 -$(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:
---- libkonq/tests/Makefile.in
-+++ libkonq/tests/Makefile.in
-@@ -279,6 +279,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33880,16 +43562,25 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -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
  
  .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*) \
-@@ -612,9 +615,9 @@
+@@ -589,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33900,10 +43591,18 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-checkPROGRAMS:
---- Makefile.in
-+++ Makefile.in
-@@ -288,6 +288,9 @@
+ 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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33913,51 +43612,47 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -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 @@
+ 
  .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)
+ .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*) \
-@@ -631,12 +634,12 @@
+@@ -612,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
 -$(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
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- config.h: stamp-h1
-@@ -648,7 +651,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 +1188,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:
+ clean-checkPROGRAMS:
 --- nsplugins/Makefile.in
 +++ nsplugins/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33967,7 +43662,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -650,7 +653,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33976,7 +43680,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +691,9 @@
+@@ -688,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33990,7 +43694,15 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/test/Makefile.in
 +++ nsplugins/test/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34000,7 +43712,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34009,7 +43730,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34023,7 +43744,15 @@
  clean-checkPROGRAMS:
 --- nsplugins/viewer/Makefile.in
 +++ nsplugins/viewer/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34033,7 +43762,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34042,7 +43780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34056,7 +43794,15 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/wrapper/Makefile.in
 +++ nsplugins/wrapper/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -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@
@@ -34066,7 +43812,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -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 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -34075,7 +43830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34087,9 +43842,67 @@
  	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
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34099,7 +43912,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34108,7 +43930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34120,7 +43942,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -723,840 +726,840 @@
+@@ -723,840 +729,840 @@
  .NOEXPORT:
  
  #>+ 2
@@ -35717,7 +45539,15 @@
  force-reedit:
 --- pics/hicolor/Makefile.in
 +++ pics/hicolor/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -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 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35727,7 +45557,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -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
  
  .SUFFIXES:
@@ -35736,7 +45575,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35748,42 +45587,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- pics/Makefile.in
-+++ pics/Makefile.in
-@@ -266,6 +266,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@
-@@ -556,7 +559,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 +597,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/wallpapers/Makefile.in
 +++ pics/wallpapers/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -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@
@@ -35793,7 +45607,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -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 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35802,7 +45625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,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