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

acinclude.m4

@@ -572,7 +572,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@@ -1733,7 +1733,7 @@ if test "$kde_qtver" = 1; then
   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 "$1"; then
@@ -2029,7 +2029,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2039,7 +2039,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])

aclocal.m4

@@ -584,7 +584,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$trinity2ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@@ -1745,7 +1745,7 @@ if test "$kde_qtver" = 1; then
   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 "$1"; then
@@ -2041,7 +2041,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2051,7 +2051,7 @@ else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])

ksystemlog/doc/Makefile

@@ -85,7 +85,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_EXTRA_RPATH = 
 KDE_INCLUDES = -I/usr/include/tde

ksystemlog/doc/en/Makefile

@@ -82,7 +82,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_EXTRA_RPATH = 
 KDE_INCLUDES = -I/usr/include/tde

ksystemlog/po/Makefile

@@ -82,7 +82,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
-KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
 KDECONFIG = /usr/bin/tde-config
 KDE_EXTRA_RPATH = 
 KDE_INCLUDES = -I/usr/include/tde

ksystemlog/src/acpid/acpidOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/acpid/acpidOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/apache/apacheOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/apache/apacheOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/bootauth/bootAuthenticationOptions.cpp

@@ -29,7 +29,7 @@
 #include <tqtooltip.h>
 
 //KDE includes
-#include <kfile.h>
+#include <tdefile.h>
 #include <klocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>

ksystemlog/src/bootauth/bootAuthenticationOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 #include <tqbuttongroup.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
  
 #include <kurlrequester.h>

ksystemlog/src/cron/cronOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/cron/cronOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/cups/cupsOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/cups/cupsOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/daemon/daemonOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/daemon/daemonOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/fileList.cpp

@@ -35,7 +35,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/generalOptions.h

@@ -26,7 +26,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 #include "globals.h"

ksystemlog/src/kernel/kernelOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/kernel/kernelOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/ksystemlog.cpp

@@ -47,11 +47,11 @@
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kaccel.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //For compatibility with old versions of KDE
 #include <tdeversion.h>

ksystemlog/src/ksystemlog.h

@@ -34,7 +34,7 @@
 //KDE includes
 #include <kapplication.h>
 #include <kmainwindow.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabwidget.h>
 #include <kactionclasses.h>
 #include <kpopupmenu.h>

ksystemlog/src/logManager.cpp

@@ -27,10 +27,10 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kfilterdev.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 
 //Project includes

ksystemlog/src/mail/mailOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/mail/mailOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/options.h

@@ -25,7 +25,7 @@
 #include <tqframe.h>
 #include <tqspinbox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 

ksystemlog/src/samba/sambaOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/samba/sambaOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/specificFileList.cpp

@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kmessagebox.h>

ksystemlog/src/system/systemOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/system/systemOptions.h

@@ -26,7 +26,7 @@
 
 #include <tqcheckbox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>

ksystemlog/src/view.h

@@ -39,7 +39,7 @@
 #include "logLineFilter.h"
 #endif
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ksystemlogiface.h>
 #include <tdeparts/part.h>

ksystemlog/src/xorg/xorgOptions.cpp

@@ -32,7 +32,7 @@
 #include <kactioncollection.h>
 #include <kbuttonbox.h>
 #include <klistbox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>

ksystemlog/src/xorg/xorgOptions.h

@@ -25,7 +25,7 @@
 #include <tqspinbox.h>
 
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kurl.h>