diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:11 -0600 |
| commit | d3eec0f20c7196c2c346089f2fb0fd8a759aba4f (patch) | |
| tree | 1aa04cea6059bb93b40711a82196d208b8ae47ea | |
| parent | 09f34fd4bdf5340f29c15c7658da39722cedcd38 (diff) | |
| download | kopete-otr-d3eec0f2.tar.gz kopete-otr-d3eec0f2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/otrguiclient.h | 2 | ||||
| -rw-r--r-- | src/otrplugin.cpp | 2 | ||||
| -rw-r--r-- | src/otrpreferences.cpp | 2 |
5 files changed, 8 insertions, 8 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/src/Makefile.am b/src/Makefile.am index 01bec5c..47584b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ servicedir = $(kde_servicesdir) kde_kcfg_DATA = kopete_otr.kcfg kcm_DATA = kopete_otr_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kopete_otr_la_LIBADD = libkotr.la -lotr diff --git a/src/otrguiclient.h b/src/otrguiclient.h index eb9ee5b..e6e1e28 100644 --- a/src/otrguiclient.h +++ b/src/otrguiclient.h @@ -25,7 +25,7 @@ #include <tqobject.h> #include <kxmlguiclient.h> -//#include <kio/job.h> +//#include <tdeio/job.h> #include <kglobal.h> #include <kstandarddirs.h> diff --git a/src/otrplugin.cpp b/src/otrplugin.cpp index 7478c59..47fdcb0 100644 --- a/src/otrplugin.cpp +++ b/src/otrplugin.cpp @@ -28,7 +28,7 @@ #include <kaction.h> #include <kactionclasses.h> #include <kpopupmenu.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kgenericfactory.h> #include <tdeversion.h> #include <kaboutdata.h> diff --git a/src/otrpreferences.cpp b/src/otrpreferences.cpp index f591113..b72ed4c 100644 --- a/src/otrpreferences.cpp +++ b/src/otrpreferences.cpp @@ -33,7 +33,7 @@ #include <kgenericfactory.h> #include <kurlrequester.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kanimwidget.h> #include <kpassivepopup.h> |