Conversion KDE3->TDE

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 227 insertions, 227 deletions

diff --git a/configure b/configure
index 0580cb0..43b9975 100755
--- a/configure
+++ b/configure
@@ -731,7 +731,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="acinclude.m4"
-ac_default_prefix=${KDEDIR:-the kde prefix}
+ac_default_prefix=${TDEDIR:-the kde prefix}
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -956,7 +956,7 @@ all_libraries
 AUTODIRS
 include_ARTS_TRUE
 include_ARTS_FALSE
-MAKEKDEWIDGETS
+MAKETDEWIDGETS
 KCONFIG_COMPILER
 KCFG_DEPENDENCIES
 DCOPIDLNG
@@ -986,28 +986,28 @@ kde_templatesdir
 kde_servicesdir
 kde_servicetypesdir
 kde_moduledir
-kdeinitdir
+tdeinitdir
 kde_styledir
 kde_widgetdir
 LIB_KDED
-LIB_KDECORE
-LIB_KDEUI
-LIB_KIO
+LIB_TDECORE
+LIB_TDEUI
+LIB_TDEIO
 LIB_KJS
 LIB_SMB
 LIB_KAB
 LIB_KABC
-LIB_KHTML
-LIB_KSPELL
-LIB_KPARTS
-LIB_KDEPRINT
-LIB_KUTILS
-LIB_KDEPIM
-LIB_KIMPROXY
+LIB_TDEHTML
+LIB_TDESPELL
+LIB_TDEPARTS
+LIB_TDEPRINT
+LIB_TDEUTILS
+LIB_TDEPIM
+LIB_TDEIMPROXY
 LIB_KNEWSTUFF
-LIB_KDNSSD
-LIB_KUNITTEST
-LIB_KSYCOCA
+LIB_TDEDNSSD
+LIB_TDEUNITTEST
+LIB_TDESYCOCA
 LIB_KFILE
 LIB_KFM
 PKGCONFIGFOUND
@@ -2739,11 +2739,11 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -2751,12 +2751,12 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
   if test "x$prefix" = "xNONE"; then
 
-   { echo "$as_me:$LINENO: checking for kde-config" >&5
-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+   { echo "$as_me:$LINENO: checking for tde-config" >&5
+echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2775,16 +2775,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kde-config"; then
+	  if test -x "$dir/tde-config"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kde-config  2>&1 "
+              evalstr="$dir/tde-config  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kde-config"
+                kde_cv_path="$dir/tde-config"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kde-config"
+		kde_cv_path="$dir/tde-config"
                 break
 	    fi
           fi
@@ -2804,10 +2804,10 @@ fi
       { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -2823,12 +2823,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
         kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
 
-   { echo "$as_me:$LINENO: checking for kde-config" >&5
-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
+   { echo "$as_me:$LINENO: checking for tde-config" >&5
+echo $ECHO_N "checking for tde-config... $ECHO_C" >&6; }
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2847,16 +2847,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kde-config"; then
+	  if test -x "$dir/tde-config"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kde-config  2>&1 "
+              evalstr="$dir/tde-config  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kde-config"
+                kde_cv_path="$dir/tde-config"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kde-config"
+		kde_cv_path="$dir/tde-config"
                 break
 	    fi
           fi
@@ -2876,10 +2876,10 @@ fi
       { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -2896,13 +2896,13 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                     This means it has been moved since you installed it.
-                    This won't work. Please recompile kdelibs for the new prefix.
+                    This won't work. Please recompile tdelibs for the new prefix.
                     " >&5
-echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
                     This means it has been moved since you installed it.
-                    This won't work. Please recompile kdelibs for the new prefix.
+                    This won't work. Please recompile tdelibs for the new prefix.
                     " >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -2913,8 +2913,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
 echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
+    { echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
+echo "${ECHO_T}$prefix (as returned by tde-config)" >&6; }
   else
         given_prefix=$prefix
     { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@@ -7581,17 +7581,17 @@ fi
 
 
 
-    kdelibsuff="$kde_libs_suffix"
-    if test -z "$kdelibsuff"; then
-       kdelibsuff="no"
+    tdelibsuff="$kde_libs_suffix"
+    if test -z "$tdelibsuff"; then
+       tdelibsuff="no"
     fi
     # Check whether --enable-libsuffix was given.
 if test "${enable_libsuffix+set}" = set; then
-  enableval=$enable_libsuffix; kdelibsuff=$enableval
+  enableval=$enable_libsuffix; tdelibsuff=$enableval
 fi
 
 
-    if test "$kdelibsuff" = "auto"; then
+    if test "$tdelibsuff" = "auto"; then
 
 cat > conftest.c << EOF
 #include <stdio.h>
@@ -7599,17 +7599,17 @@ int main() {
  return 0;
 }
 EOF
-        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
+        tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
     s,.*/lib\([^\/]*\)/.*,\1,
     p
 }'`
 	rm -rf conftest.*
     fi
 
-    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then
+       tdelibsuff=
     fi
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
 echo "${ECHO_T}not using lib directory suffix" >&6; }
 
@@ -7619,16 +7619,16 @@ _ACEOF
 
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             libdir="$libdir"
           fi
 
 cat >>confdefs.h <<_ACEOF
-#define KDELIBSUFF "${kdelibsuff}"
+#define KDELIBSUFF "${tdelibsuff}"
 _ACEOF
 
-        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
+        { echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5
+echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6; }
     fi
 
 # Check whether --enable-fast-install was given.
@@ -22525,7 +22525,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 
 
@@ -22957,7 +22957,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then
 else
   case "strlcat" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcat="yes - in libkdefakes"
+		kde_cv_proto_strlcat="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_strlcat=unknown
@@ -23168,7 +23168,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then
 else
   case "strlcpy" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcpy="yes - in libkdefakes"
+		kde_cv_proto_strlcpy="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_strlcpy=unknown
@@ -25247,7 +25247,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
 else
   case "res_init" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_res_init="yes - in libkdefakes"
+		kde_cv_proto_res_init="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_res_init=unknown
@@ -28787,41 +28787,41 @@ sed 's/^/| /' conftest.$ac_ext >&5
 	LIBS="$ac_save_LIBS"
 # First see if replacing the include by lib works.
 # Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+    /usr/X11/lib${tdelibsuff}           \
+    /usr/X11R6/lib${tdelibsuff}         \
+    /usr/X11R5/lib${tdelibsuff}         \
+    /usr/X11R4/lib${tdelibsuff}         \
                                         \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
+    /usr/lib${tdelibsuff}/X11           \
+    /usr/lib${tdelibsuff}/X11R6         \
+    /usr/lib${tdelibsuff}/X11R5         \
+    /usr/lib${tdelibsuff}/X11R4         \
                                         \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
+    /usr/local/X11/lib${tdelibsuff}     \
+    /usr/local/X11R6/lib${tdelibsuff}   \
+    /usr/local/X11R5/lib${tdelibsuff}   \
+    /usr/local/X11R4/lib${tdelibsuff}   \
                                         \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
+    /usr/local/lib${tdelibsuff}/X11     \
+    /usr/local/lib${tdelibsuff}/X11R6   \
+    /usr/local/lib${tdelibsuff}/X11R5   \
+    /usr/local/lib${tdelibsuff}/X11R4   \
                                         \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
+    /usr/X386/lib${tdelibsuff}          \
+    /usr/x386/lib${tdelibsuff}          \
+    /usr/XFree86/lib${tdelibsuff}/X11   \
                                         \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
+    /usr/lib${tdelibsuff}               \
+    /usr/local/lib${tdelibsuff}         \
+    /usr/unsupported/lib${tdelibsuff}   \
+    /usr/athena/lib${tdelibsuff}        \
+    /usr/local/x11r5/lib${tdelibsuff}   \
+    /usr/lpp/Xamples/lib${tdelibsuff}   \
+    /lib/usr/lib${tdelibsuff}/X11       \
                                         \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
+    /usr/openwin/lib${tdelibsuff}       \
+    /usr/openwin/share/lib${tdelibsuff} \
     ; \
 do
   for ac_extension in a so sl; do
@@ -28886,7 +28886,7 @@ fi
     ac_x_includes="."
   fi
   if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
+    ac_x_libraries="/usr/lib${tdelibsuff}"
   fi
 esac
 #from now on we use our own again
@@ -30237,7 +30237,7 @@ qt_includes=""
 # Check whether --with-qt-dir was given.
 if test "${with_qt_dir+set}" = set; then
   withval=$with_qt_dir;   ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
 
 fi
@@ -30302,7 +30302,7 @@ ac_qt_includes="$qt_incdir"
 
 qt_libdirs=""
 for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+   qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
 done
 qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
 if test ! "$ac_qt_libraries" = "NO"; then
@@ -31103,16 +31103,16 @@ else
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z ""; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 
 kde_incdir=NO
@@ -31141,8 +31141,8 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 
 kde_libdir=NO
@@ -31166,7 +31166,7 @@ kde_widgetdir=NO
 kde_widgetdir=NO
 for i in $kde_libdirs;
 do
-  for j in "kde3/plugins/designer/kdewidgets.la";
+  for j in "kde3/plugins/designer/tdewidgets.la";
   do
     echo "configure: 31171: $i/$j" >&5
     if test -r "$i/$j"; then
@@ -31188,13 +31188,13 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
 { { echo "$as_me:$LINENO: error:
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&5
+by tdelibs" >&5
 echo "$as_me: error:
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&2;}
+by tdelibs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -31328,20 +31328,20 @@ fi
 echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
 if test "$kde_cv_uic_plugins" != yes; then
 	{ { echo "$as_me:$LINENO: error:
-you need to install kdelibs first.
+you need to install tdelibs first.
 
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs.
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs.
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 " >&5
 echo "$as_me: error:
-you need to install kdelibs first.
+you need to install tdelibs first.
 
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs.
-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs.
+The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
 _same Qt version_, compiled with the _same compiler_ and the same Qt
 configuration settings.
 " >&2;}
@@ -31516,20 +31516,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -31592,7 +31592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -31604,22 +31604,22 @@ echo "${ECHO_T}yes" >&6; }
 else
   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
 echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 
@@ -31818,20 +31818,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -31894,7 +31894,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -31906,22 +31906,22 @@ echo "${ECHO_T}yes" >&6; }
 else
   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&5
 echo "$as_me: error: your system fails at linking a small KDE application!
 Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
 For more details about this problem, look at the end of config.log." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 
@@ -32030,11 +32030,11 @@ _ACEOF
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -32408,12 +32408,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
         if test -n "$kde32ornewer"; then
 
-   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
+   { echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5
+echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6; }
    if test -n "$KCONFIG_COMPILER"; then
         kde_cv_path="$KCONFIG_COMPILER";
    else
-        kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32432,16 +32432,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kconfig_compiler"; then
+	  if test -x "$dir/tdeconfig_compiler"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kconfig_compiler  2>&1 "
+              evalstr="$dir/tdeconfig_compiler  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kconfig_compiler"
+                kde_cv_path="$dir/tdeconfig_compiler"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kconfig_compiler"
+		kde_cv_path="$dir/tdeconfig_compiler"
                 break
 	    fi
           fi
@@ -32461,10 +32461,10 @@ fi
       { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+    { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kconfig_compiler was not found!
+echo "$as_me: error: The important program tdeconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -32548,12 +32548,12 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
         fi
         if test -n "$kde33ornewer"; then
 
-   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
-   if test -n "$MAKEKDEWIDGETS"; then
-        kde_cv_path="$MAKEKDEWIDGETS";
+   { echo "$as_me:$LINENO: checking for maketdewidgets" >&5
+echo $ECHO_N "checking for maketdewidgets... $ECHO_C" >&6; }
+   if test -n "$MAKETDEWIDGETS"; then
+        kde_cv_path="$MAKETDEWIDGETS";
    else
-        kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
+        kde_cache=`echo maketdewidgets | sed 'y%./+-%__p_%'`
 
         if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32572,16 +32572,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/makekdewidgets"; then
+	  if test -x "$dir/maketdewidgets"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/makekdewidgets  2>&1 "
+              evalstr="$dir/maketdewidgets  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/makekdewidgets"
+                kde_cv_path="$dir/maketdewidgets"
                 break
 	      fi
             else
-		kde_cv_path="$dir/makekdewidgets"
+		kde_cv_path="$dir/maketdewidgets"
                 break
 	    fi
           fi
@@ -32601,10 +32601,10 @@ fi
       { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
 
-    { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
+    { { echo "$as_me:$LINENO: error: The important program maketdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program makekdewidgets was not found!
+echo "$as_me: error: The important program maketdewidgets was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -32612,7 +32612,7 @@ Please check whether you installed KDE correctly.
    else
       { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
 echo "${ECHO_T}$kde_cv_path" >&6; }
-      MAKEKDEWIDGETS=$kde_cv_path
+      MAKETDEWIDGETS=$kde_cv_path
 
    fi
 
@@ -32682,7 +32682,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
 
 KDE_XSL_STYLESHEET=NO
 for i in $kde_sharedirs;
@@ -32744,7 +32744,7 @@ done
 
 
 
-kdeinitdir='$(kde_moduledir)'
+tdeinitdir='$(kde_moduledir)'
 
 
 
@@ -32763,16 +32763,16 @@ fi
 
 if test $kde_qtver = 3; then
    case $host in
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
                *) lib_kded="" ;;
        esac
    LIB_KDED=$lib_kded
 
-   LIB_KDECORE="-lkdecore"
+   LIB_TDECORE="-ltdecore"
 
-   LIB_KDEUI="-lkdeui"
+   LIB_TDEUI="-ltdeui"
 
-   LIB_KIO="-lkio"
+   LIB_TDEIO="-ltdeio"
 
    LIB_KJS="-lkjs"
 
@@ -32780,66 +32780,66 @@ if test $kde_qtver = 3; then
 
    LIB_KAB="-lkab"
 
-   LIB_KABC="-lkabc"
+   LIB_KABC="-ltdeabc"
 
-   LIB_KHTML="-lkhtml"
+   LIB_TDEHTML="-ltdehtml"
 
-   LIB_KSPELL="-lkspell"
+   LIB_TDESPELL="-ltdespell"
 
-   LIB_KPARTS="-lkparts"
+   LIB_TDEPARTS="-ltdeparts"
 
-   LIB_KDEPRINT="-lkdeprint"
+   LIB_TDEPRINT="-ltdeprint"
 
-   LIB_KUTILS="-lkutils"
+   LIB_TDEUTILS="-ltdeutils"
 
-   LIB_KDEPIM="-lkdepim"
+   LIB_TDEPIM="-ltdepim"
 
-   LIB_KIMPROXY="-lkimproxy"
+   LIB_TDEIMPROXY="-ltdeimproxy"
 
    LIB_KNEWSTUFF="-lknewstuff"
 
-   LIB_KDNSSD="-lkdnssd"
+   LIB_TDEDNSSD="-ltdednssd"
 
-   LIB_KUNITTEST="-lkunittest"
+   LIB_TDEUNITTEST="-ltdeunittest"
 
 # these are for backward compatibility
-   LIB_KSYCOCA="-lkio"
+   LIB_TDESYCOCA="-ltdeio"
 
-   LIB_KFILE="-lkio"
+   LIB_KFILE="-ltdeio"
 
 elif test $kde_qtver = 2; then
-   LIB_KDECORE="-lkdecore"
+   LIB_TDECORE="-ltdecore"
 
-   LIB_KDEUI="-lkdeui"
+   LIB_TDEUI="-ltdeui"
 
-   LIB_KIO="-lkio"
+   LIB_TDEIO="-ltdeio"
 
-   LIB_KSYCOCA="-lksycoca"
+   LIB_TDESYCOCA="-ltdesycoca"
 
    LIB_SMB="-lsmb"
 
-   LIB_KFILE="-lkfile"
+   LIB_KFILE="-ltdefile"
 
    LIB_KAB="-lkab"
 
-   LIB_KHTML="-lkhtml"
+   LIB_TDEHTML="-ltdehtml"
 
-   LIB_KSPELL="-lkspell"
+   LIB_TDESPELL="-ltdespell"
 
-   LIB_KPARTS="-lkparts"
+   LIB_TDEPARTS="-ltdeparts"
 
-   LIB_KDEPRINT="-lkdeprint"
+   LIB_TDEPRINT="-ltdeprint"
 
 else
-   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
+   LIB_TDECORE="-ltdecore -lXext $(LIB_QT)"
 
-   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
+   LIB_TDEUI="-ltdeui $(LIB_TDECORE)"
 
-   LIB_KFM="-lkfm $(LIB_KDECORE)"
+   LIB_KFM="-lkfm $(LIB_TDECORE)"
 
-   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
+   LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)"
 
-   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
+   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"
 
 fi
 
@@ -34960,14 +34960,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 
 
-kdeversion_save_CXXFLAGS="$CXXFLAGS"
-kdeversion_safe_LIBS="$LIBS"
+tdeversion_save_CXXFLAGS="$CXXFLAGS"
+tdeversion_safe_LIBS="$LIBS"
 LIBS="$LIBS $X_EXTRA_LIBS"
 CXXFLAGS="$CXXFLAGS $all_includes"
 
 cat >conftest.$ac_ext <<_ACEOF
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 2, 90 ) )
 #error KDE 3.2
 #endif
@@ -35004,7 +35004,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 cat >conftest.$ac_ext <<_ACEOF
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 3, 90 ) )
 #error KDE 3.3
 #endif
@@ -35041,7 +35041,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 cat >conftest.$ac_ext <<_ACEOF
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 4, 90 ) )
 #error KDE 3.4
 #endif
@@ -35078,7 +35078,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 cat >conftest.$ac_ext <<_ACEOF
 
-#include <kdeversion.h>
+#include <tdeversion.h>
 #if ! ( KDE_IS_VERSION( 3, 5, 2 ) )
 #error KDE 3.5.x (x < 2)
 #endif
@@ -35112,8 +35112,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-CXXFLAGS="$kdeversion_save_CXXFLAGS"
-LIBS="$kdeversion_safe_LIBS"
+CXXFLAGS="$tdeversion_save_CXXFLAGS"
+LIBS="$tdeversion_safe_LIBS"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -36313,7 +36313,7 @@ all_libraries!$all_libraries$ac_delim
 AUTODIRS!$AUTODIRS$ac_delim
 include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
 include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
-MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+MAKETDEWIDGETS!$MAKETDEWIDGETS$ac_delim
 KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
 KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
 DCOPIDLNG!$DCOPIDLNG$ac_delim
@@ -36384,28 +36384,28 @@ kde_templatesdir!$kde_templatesdir$ac_delim
 kde_servicesdir!$kde_servicesdir$ac_delim
 kde_servicetypesdir!$kde_servicetypesdir$ac_delim
 kde_moduledir!$kde_moduledir$ac_delim
-kdeinitdir!$kdeinitdir$ac_delim
+tdeinitdir!$tdeinitdir$ac_delim
 kde_styledir!$kde_styledir$ac_delim
 kde_widgetdir!$kde_widgetdir$ac_delim
 LIB_KDED!$LIB_KDED$ac_delim
-LIB_KDECORE!$LIB_KDECORE$ac_delim
-LIB_KDEUI!$LIB_KDEUI$ac_delim
-LIB_KIO!$LIB_KIO$ac_delim
+LIB_TDECORE!$LIB_TDECORE$ac_delim
+LIB_TDEUI!$LIB_TDEUI$ac_delim
+LIB_TDEIO!$LIB_TDEIO$ac_delim
 LIB_KJS!$LIB_KJS$ac_delim
 LIB_SMB!$LIB_SMB$ac_delim
 LIB_KAB!$LIB_KAB$ac_delim
 LIB_KABC!$LIB_KABC$ac_delim
-LIB_KHTML!$LIB_KHTML$ac_delim
-LIB_KSPELL!$LIB_KSPELL$ac_delim
-LIB_KPARTS!$LIB_KPARTS$ac_delim
-LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
-LIB_KUTILS!$LIB_KUTILS$ac_delim
-LIB_KDEPIM!$LIB_KDEPIM$ac_delim
-LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
+LIB_TDEHTML!$LIB_TDEHTML$ac_delim
+LIB_TDESPELL!$LIB_TDESPELL$ac_delim
+LIB_TDEPARTS!$LIB_TDEPARTS$ac_delim
+LIB_TDEPRINT!$LIB_TDEPRINT$ac_delim
+LIB_TDEUTILS!$LIB_TDEUTILS$ac_delim
+LIB_TDEPIM!$LIB_TDEPIM$ac_delim
+LIB_TDEIMPROXY!$LIB_TDEIMPROXY$ac_delim
 LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
-LIB_KDNSSD!$LIB_KDNSSD$ac_delim
-LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
-LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
+LIB_TDEDNSSD!$LIB_TDEDNSSD$ac_delim
+LIB_TDEUNITTEST!$LIB_TDEUNITTEST$ac_delim
+LIB_TDESYCOCA!$LIB_TDESYCOCA$ac_delim
 LIB_KFILE!$LIB_KFILE$ac_delim
 LIB_KFM!$LIB_KFM$ac_delim
 PKGCONFIGFOUND!$PKGCONFIGFOUND$ac_delim
@@ -37022,13 +37022,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi