Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 09f34fd4bd
commit d3eec0f20c

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(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)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

@ -26,7 +26,7 @@ servicedir = $(kde_servicesdir)
kde_kcfg_DATA = kopete_otr.kcfg kde_kcfg_DATA = kopete_otr.kcfg
kcm_DATA = kopete_otr_config.desktop kcm_DATA = kopete_otr_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog kcmdir = $(kde_servicesdir)/tdeconfiguredialog
kopete_otr_la_LIBADD = libkotr.la -lotr kopete_otr_la_LIBADD = libkotr.la -lotr

@ -25,7 +25,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
//#include <kio/job.h> //#include <tdeio/job.h>
#include <kglobal.h> #include <kglobal.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>

@ -28,7 +28,7 @@
#include <kaction.h> #include <kaction.h>
#include <kactionclasses.h> #include <kactionclasses.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <tdeversion.h> #include <tdeversion.h>
#include <kaboutdata.h> #include <kaboutdata.h>

@ -33,7 +33,7 @@
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kapplication.h> #include <kapplication.h>
#include <kanimwidget.h> #include <kanimwidget.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>

Loading…
Cancel
Save