From 253660a88b337c06a4e2f579cfcc13b678ed84a6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 00:52:55 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 acinclude.m4                | 8 ++++----
 keep/app/keepmainwindow.cpp | 2 +-
 keep/common/backupconfig.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 60985a2..d58e432 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -602,7 +602,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
         if test -n "$trinity3ornewer"; then
@@ -1788,7 +1788,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
@@ -2094,7 +2094,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")
@@ -2104,7 +2104,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
 ])
diff --git a/keep/app/keepmainwindow.cpp b/keep/app/keepmainwindow.cpp
index f8e670c..68a5f0c 100644
--- a/keep/app/keepmainwindow.cpp
+++ b/keep/app/keepmainwindow.cpp
@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "backupconfig.h"
 #include "addbackupwizard.h"
diff --git a/keep/common/backupconfig.h b/keep/common/backupconfig.h
index 166e4ca..b3645e1 100644
--- a/keep/common/backupconfig.h
+++ b/keep/common/backupconfig.h
@@ -21,7 +21,7 @@
 
 #include <tqvaluelist.h>
 #include <tqobject.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "backup.h"
 
-- 
cgit v1.2.1