diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:53:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:53:10 -0600 |
| commit | 8407e1de0c1e5cf42ad943721f7dd7c7e45c30ff (patch) | |
| tree | 26e815b9efa8a2a0405b2ee473bb1eefcaf85f58 | |
| parent | d8aa44e1c28dc7466980d6779dcd2444f1362495 (diff) | |
| download | kima-8407e1de0c1e5cf42ad943721f7dd7c7e45c30ff.tar.gz kima-8407e1de0c1e5cf42ad943721f7dd7c7e45c30ff.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | src/kima.cpp | 2 | ||||
| -rw-r--r-- | src/sources/source.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d370294..8811fd4 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/kima.cpp b/src/kima.cpp index d4465e6..5ea4e64 100644 --- a/src/kima.cpp +++ b/src/kima.cpp @@ -42,7 +42,7 @@ #include <kactionclasses.h> #include <kapplication.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> //#include <kglobal.h> #include <kiconloader.h> #include <klocale.h> diff --git a/src/sources/source.h b/src/sources/source.h index b299fe8..e938297 100644 --- a/src/sources/source.h +++ b/src/sources/source.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include "sourceprefs.h" -#include <kconfig.h> +#include <tdeconfig.h> // Forward Declarationss class TQVBoxLayout; |