diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:54:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:54:02 -0600 |
| commit | edf2d6cc5bbee10e7393f13e5e164172631d7b70 (patch) | |
| tree | 48ba5ad2426105b754001c85a4a38fd65447528e | |
| parent | 15d80e77bebb34106f5975f6a97015e5933ed108 (diff) | |
| download | knutclient-edf2d6cc5bbee10e7393f13e5e164172631d7b70.tar.gz knutclient-edf2d6cc5bbee10e7393f13e5e164172631d7b70.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rwxr-xr-x | src/knutclient.cpp | 2 | ||||
| -rw-r--r-- | src/knutmainwindow.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b779367..e2e7b05 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/src/knutclient.cpp b/src/knutclient.cpp index 19948bc..1ed6c60 100755 --- a/src/knutclient.cpp +++ b/src/knutclient.cpp @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <tqmutex.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <twin.h> diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp index bc0eb15..bcdee4f 100644 --- a/src/knutmainwindow.cpp +++ b/src/knutmainwindow.cpp @@ -21,7 +21,7 @@ #include <kmessagebox.h> #include <kstdaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <kstatusbar.h> #include <kkeydialog.h> |