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

r14.0.x
Timothy Pearson 12 years ago
parent 90fbd25719
commit b67b819ae6

@ -597,7 +597,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
@ -1789,7 +1789,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
@ -2089,7 +2089,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")
@ -2099,7 +2099,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
])

@ -36,7 +36,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
//Sword includes
#include <swbuf.h>

@ -43,7 +43,7 @@
#include <tdeversion.h>
#include <kaction.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcmdlineargs.h>
#include <klocale.h>
#include <kaccel.h>

@ -51,7 +51,7 @@
#include <kaccel.h>
#include <kaction.h>
#include <kapplication.h>
#include <kconfigbase.h>
#include <tdeconfigbase.h>
#include <tdeversion.h>
#include <kglobal.h>
#include <khelpmenu.h>

@ -22,7 +22,7 @@
#include <klocale.h>
#include <kstandarddirs.h>
#include <kprocess.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
//Sword includes

@ -32,7 +32,7 @@
#else
#include <kaction.h>
#endif
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcharsets.h>
#include <kglobal.h>
#include <klocale.h>

@ -32,7 +32,7 @@
//KDE includes
#include <kprogress.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kapplication.h>

@ -61,8 +61,8 @@
#include <klistbox.h>
#include <kkeydialog.h>
#include <kaction.h>
#include <kconfigbase.h>
#include <kconfig.h>
#include <tdeconfigbase.h>
#include <tdeconfig.h>
//Sword includes
#include <localemgr.h>

@ -36,7 +36,7 @@
//KDE includes
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdirselectdialog.h>
#include <keditlistbox.h>
#include <klocale.h>

@ -26,7 +26,7 @@
//KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>

@ -41,9 +41,9 @@
#include <tqtextstream.h>
//KDE includes
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <kstandarddirs.h>

@ -37,7 +37,7 @@
//KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kiconloader.h>

@ -37,7 +37,7 @@
//KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kiconloader.h>

@ -38,7 +38,7 @@
//KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kiconloader.h>

@ -41,7 +41,7 @@
//KDE includes
#include <kapplication.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kiconloader.h>

@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <kurl.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kapplication.h>

Loading…
Cancel
Save