diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:56:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:56:41 -0600 |
| commit | 32e836accea50911bbdda0c2d79746efd71139b8 (patch) | |
| tree | c9691c18613a3d4f268b9a0606ba5f49eb445751 | |
| parent | a09808934af2821e976a31c7f498f45c2523105f (diff) | |
| download | twin-style-crystal-32e836accea50911bbdda0c2d79746efd71139b8.tar.gz twin-style-crystal-32e836accea50911bbdda0c2d79746efd71139b8.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | client/config/crystalconfig.cc | 4 | ||||
| -rw-r--r-- | client/crystalclient.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index a2b698c..f9d865e 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/client/config/crystalconfig.cc b/client/config/crystalconfig.cc index da0ddda..3d90707 100644 --- a/client/config/crystalconfig.cc +++ b/client/config/crystalconfig.cc @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <tqbuttongroup.h> @@ -35,7 +35,7 @@ #include <tqlineedit.h> #include <tqfiledialog.h> #include <kcolorbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqpicture.h> #include <kapplication.h> #include <kurlrequester.h> diff --git a/client/crystalclient.cc b/client/crystalclient.cc index 35f2028..2459b4a 100644 --- a/client/crystalclient.cc +++ b/client/crystalclient.cc @@ -19,7 +19,7 @@ ***************************************************************************/ #include "config.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <klocale.h> |