Rename a number of libraries and executables to avoid conflicts with KDE4

acinclude.m4

@@ -2014,11 +2014,11 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
@@ -2027,13 +2027,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2450,7 +2450,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then

aclocal.m4

@@ -2026,11 +2026,11 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
@@ -2039,13 +2039,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2462,7 +2462,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then

ksystemlog/doc/Makefile

@@ -126,12 +126,12 @@ LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
-LIB_KHTML = -lkhtml
+LIB_KHTML = -ltdehtml
 LIB_KIO = -lkio
-LIB_KPARTS = -lkparts
+LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -lkspell
+LIB_KSPELL = -ltdespell
 LIB_KSYCOCA = -lkio
-LIB_KUTILS = -lkutils
+LIB_KUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/doc/en/Makefile

@@ -123,12 +123,12 @@ LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
-LIB_KHTML = -lkhtml
+LIB_KHTML = -ltdehtml
 LIB_KIO = -lkio
-LIB_KPARTS = -lkparts
+LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -lkspell
+LIB_KSPELL = -ltdespell
 LIB_KSYCOCA = -lkio
-LIB_KUTILS = -lkutils
+LIB_KUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/po/Makefile

@@ -123,12 +123,12 @@ LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
 LIB_KFILE = -lkio
 LIB_KFM = 
-LIB_KHTML = -lkhtml
+LIB_KHTML = -ltdehtml
 LIB_KIO = -lkio
-LIB_KPARTS = -lkparts
+LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -lkspell
+LIB_KSPELL = -ltdespell
 LIB_KSYCOCA = -lkio
-LIB_KUTILS = -lkutils
+LIB_KUTILS = -ltdeutils
 LIB_POLL = 
 LIB_QPE = 
 LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread

ksystemlog/src/Makefile.am

@@ -14,7 +14,7 @@ INCLUDES = -I$(top_srcdir)/ksystemlog/src      -I$(top_builddir)/ksystemlog/src/
 	-I$(top_srcdir)/ksystemlog/src/system  -I$(top_srcdir)/ksystemlog/src/xorg $(all_includes)
 
 # the library search path. 
-ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkutils
+ksystemlog_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdeutils
 
 # the libraries to link against.
 ksystemlog_LDADD = \

ksystemlog/src/view.h

@@ -42,7 +42,7 @@
 #include <kconfig.h>
 
 #include <ksystemlogiface.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include "globals.h"
 #include "logListItem.h"