diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:52 -0600 |
| commit | af3f023bd205b190f34dcfcb46735a03b6f28ee1 (patch) | |
| tree | 3214fdbab24915922da591b9931c5f28a2e76d93 | |
| parent | 75c972361d9e4502971af35f653e14c5e7929c48 (diff) | |
| download | kdpkg-af3f023bd205b190f34dcfcb46735a03b6f28ee1.tar.gz kdpkg-af3f023bd205b190f34dcfcb46735a03b6f28ee1.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | kdpkg-install/install.cpp | 2 | ||||
| -rw-r--r-- | kdpkg/kdpkg.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7fa8158..52ab1c3 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/kdpkg-install/install.cpp b/kdpkg-install/install.cpp index 92686f0..b239642 100644 --- a/kdpkg-install/install.cpp +++ b/kdpkg-install/install.cpp @@ -21,7 +21,7 @@ #include <kgenericfactory.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kurlrequester.h> #include <kaboutapplication.h> diff --git a/kdpkg/kdpkg.cpp b/kdpkg/kdpkg.cpp index 1ebe469..d26e4f0 100644 --- a/kdpkg/kdpkg.cpp +++ b/kdpkg/kdpkg.cpp @@ -18,7 +18,7 @@ */ -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kgenericfactory.h> #include <kaboutapplication.h> |