--- macros/kde4.m4.orig	2010-10-03 18:52:26.237297999 +0300
+++ macros/kde4.m4	2010-10-03 19:24:57.305677999 +0300
@@ -44,22 +44,22 @@
   fi
 
   dnl Specifiy a custom directory for the kparts plugin
-  AC_ARG_WITH(kde4_plugindir, AC_HELP_STRING([--with-kde4-plugindir=DIR],
-             [Directory to install KDE 4.x plugin in]),
-             with_kde4_plugindir=${withval})
-  if test x"${with_kde4_plugindir}" != x ; then 
-    if test ! -d ${with_kde4_plugindir}/imageformats; then
-      AC_MSG_ERROR([${with_kde4_plugindir} directory doesn't contain any KDE 4.x plugins!])
+  AC_ARG_WITH(kde4_kpartdir, AC_HELP_STRING([--with-kde4-kpartdir=DIR],
+             [Directory to install KDE 4.x kpart in]),
+             with_kde4_kpartdir=${withval})
+  if test x"${with_kde4_kpartdir}" != x ; then 
+    if test ! -f ${with_kde4_kpartdir}/libkhtmlpart.so; then
+      AC_MSG_ERROR([${with_kde4_kpartdir} directory doesn't contain any KDE 4.x kparts!])
     fi
   fi
 
   dnl Specifiy a custom directory for the kde services directory
   AC_ARG_WITH(kde4_servicesdir, AC_HELP_STRING([--with-kde4-servicesdir=DIR],
-             [Directory to install KDE 4.x plugin in]),
+             [Directory to install KDE 4.x service in]),
              with_kde4_servicesdir=${withval})
   if test x"${with_kde4_servicesdir}" != x ; then 
-    if test ! -d ${with_kde4_servicesdir}; then
-      AC_MSG_ERROR([${with_kde4_} directory doesn't contain any KDE 4.x plugins!])
+    if test ! -f ${with_kde4_servicesdir}/khtmladaptorpart.desktop; then
+      AC_MSG_ERROR([${with_kde4_} directory doesn't contain any KDE 4.x services!])
     fi
   fi
 
@@ -136,7 +136,7 @@
     dnl Look for the libraries
     AC_CACHE_VAL(ac_cv_path_kde4_lib, [
       if test x"${with_kde4_lib}" != x ; then
-        if test -f ${with_kde4_lib}/libkdeui.la; then
+        if test -f ${with_kde4_lib}/libkdeui.so; then
 	        ac_cv_path_kde4_lib="-L`(cd ${with_kde4_lib}; pwd)`"
         else
 	        AC_MSG_ERROR([${with_kde4_lib} directory doesn't contain KDE 4.x libraries.])
@@ -198,25 +198,21 @@
       esac
     fi
 
-    if test x"${with_kde4_plugindir}" != x ; then 
-      KDE4_PLUGINDIR="${with_kde4_plugindir}/lib/kde4"
+    if test x"${with_kde4_kpartdir}" != x ; then 
+      KDE4_KPARTDIR="${with_kde4_kpartdir}"
     else
-      KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
+      KDE4_KPARTDIR="${KDE4_PREFIX}/lib/kde4"
     fi
     if test x"${with_kde4_servicesdir}" != x ; then 
-      KDE4_SERVICESDIR="${with_kde4_servicesdir}/share/kde4/services"
+      KDE4_SERVICESDIR="${with_kde4_servicesdir}"
     else
       KDE4_SERVICESDIR="${KDE4_PREFIX}/share/kde4/services"
     fi
-    if test x"${KDE4_CONFIGDIR}" != x ; then 
-      KDE4_CONFIGDIR="${KDE4_CONFIGDIR}}/share/kde4/config"
-    else
+    if test x"${KDE4_CONFIGDIR}" == x ; then 
       KDE4_CONFIGDIR="${KDE4_PREFIX}}/share/kde4/config"
     fi
-    if test x"${KDE4_APPSDATADIR}" != x ; then 
-      KDE4_APPSDATADIR="${KDE4_APPSDATADIR}/share/kde4/apps/klash"
-    else
-      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
+    if test x"${KDE4_APPSDATADIR}" == x ; then 
+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/apps/klash"
     fi
   fi                            dnl end of build_kparts4
 
@@ -243,7 +239,7 @@
   AC_SUBST(KDE4_CFLAGS)  
   AC_SUBST(KDE4_LIBS)
 
-  AC_SUBST(KDE4_PLUGINDIR)
+  AC_SUBST(KDE4_KPARTDIR)
   AC_SUBST(KDE4_SERVICESDIR)
   AC_SUBST(KDE4_CONFIGDIR)
   AC_SUBST(KDE4_APPSDATADIR)
--- Makefile.am.orig	2010-10-03 19:26:59.713517998 +0300
+++ Makefile.am	2010-10-03 19:28:11.746182994 +0300
@@ -487,7 +487,7 @@
 endif
 if KPARTS4
 	@echo "	KPARTS 4.x (KDE) plugin enabled"
-	@echo "	  KPARTS 4.x plugin install dir: $(KDE4_PLUGINDIR)"
+	@echo "	  KPARTS 4.x kpart install dir: $(KDE4_KPARTDIR)"
 	@echo "	  KPARTS 4.x service install dir: $(KDE4_SERVICESDIR)"
 	@echo "	  KPARTS 4.x config dir: ${KDE4_CONFIGDIR}"
 	@echo "	  KPARTS 4.x appsdata dir: ${KDE4_APPSDATADIR}"
--- plugin/klash4/Makefile.am.orig	2010-10-03 19:28:31.676143002 +0300
+++ plugin/klash4/Makefile.am	2010-10-03 19:33:05.366252999 +0300
@@ -24,7 +24,7 @@
 	$(X11_CFLAGS) \
 	-DGNASHBINDIR=\"${bindir}\"
 
-plugindir   = $(KDE4_PLUGINDIR)
+kpartdir   = $(KDE4_KPARTDIR)
 kde_servicesdir = $(KDE4_SERVICESDIR)
 kde_rcdir       = $(KDE4_APPSDATADIR)
 #$(prefix)/share/apps/klash
@@ -33,14 +33,14 @@
 kde_configdir   = $(KDE4_CONFIGDIR)
 #$(prefix)/share/config
 
-plugin_LTLIBRARIES= libklashpart.la
+kpart_LTLIBRARIES= libklashpart.la
 
 libklashpart_la_SOURCES = klash_part.cpp klash_part.h
 libklashpart_la_DEPENDENCIES = klash_part.moc
 if PLUGIN_LINK_UNDEFINED
-libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
+libklashpart_la_LDFLAGS = -avoid-version -L$(kpartdir) $(KDE4_LIBS) $(QT4_LIBS)
 else
-libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
+libklashpart_la_LDFLAGS = -module -avoid-version -L$(kpartdir) $(KDE4_LIBS) $(QT4_LIBS)
 endif
 
 dist_kde_services_DATA = klash_part.desktop
@@ -88,23 +88,23 @@
 	test -d $(DESTDIR)$(kde_appsdatadir) || $(mkinstalldirs) $(DESTDIR)$(kde_appsdatadir)
 	$(INSTALL) $(srcdir)/$(dist_kde_appsdata_DATA) $(DESTDIR)$(kde_appsdatadir)
 
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+install-kpartLTLIBRARIES: $(kpart_LTLIBRARIES)
 	@echo "Nothing to install here now."
-	@echo "Use \"make install-plugin\" to install the KDE plugin to $(DESTDIR)$(plugindir)."
+	@echo "Use \"make install-kpart\" to install the KDE kpart to $(DESTDIR)$(kpartdir)."
 
-install-plugin install-plugins: test_perms $(plugin_LTLIBRARIES) $(dist_kde_services_DATA) \
+install-kpart install-plugins: test_perms $(kpart_LTLIBRARIES) $(dist_kde_services_DATA) \
 	install-dist_kde_appsdataDATA install-dist_kde_rcDATA \
 	install-dist_kde_servicesDATA
-	test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) $(DESTDIR)$(plugindir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
+	test -d $(DESTDIR)$(kpartdir) || $(mkinstalldirs) $(DESTDIR)$(kpartdir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $(kpart_LTLIBRARIES) $(DESTDIR)$(kpartdir)
 
-uninstall-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-	$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
-	$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
-	$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
+uninstall-kpartLTLIBRARIES: $(kpart_LTLIBRARIES)
+	$(RM) -f $(DESTDIR)$(kpartdir)/libklashpart.so
+	$(RM) -f $(DESTDIR)$(kpartdir)/libklashpart.la
+	$(RM) -f $(DESTDIR)$(kpartdir)/libklashpart.a
 
 endif
 
 force:
 
-.PHONY : install-plugins install-plugin test_perms
+.PHONY : install-plugins install-kpart test_perms
--- configure.ac.orig	2010-10-03 19:33:29.288207999 +0300
+++ configure.ac	2010-10-03 19:37:00.050203001 +0300
@@ -2976,7 +2976,7 @@
 
 if test x"${build_kparts4}" = x"yes"; then
   echo "        KPARTS 4.x plugin enabled (default). Use --disable-kparts4 to disable"
-  echo "            KPARTS 4.x plugin will be installed in ${KDE4_PLUGINDIR}"
+  echo "            KPARTS 4.x kpart will be installed in ${KDE4_KPARTDIR}"
   echo "            KPARTS 4.x service will be installed in ${KDE4_SERVICESDIR}"
   echo "            KPARTS 4.x config dir will be in ${KDE4_CONFIGDIR}"
   echo "            KPARTS 4.x appsdata will be installed in ${KDE4_APPSDATADIR}"