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

pull/1/head
Timothy Pearson 12 years ago
parent 8c0ea4fa2a
commit ce06c80f9a

@ -2522,7 +2522,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-ltdecore -ltdeui -lkparts -lDCOP -ltdefx -lkio $SS_LIBLINK" SS_LIBLINK="-ltdecore -ltdeui -ltdeparts -lDCOP -ltdefx -lkio $SS_LIBLINK"
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support]) AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support]) AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support])
AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support]) AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support])

@ -38,8 +38,8 @@
#include "ktrader.h" #include "ktrader.h"
// #include "kparts/part.h" // #include "tdeparts/part.h"
// #include "kparts/factory.h" // #include "tdeparts/factory.h"
// #include "klibloader.h" // #include "klibloader.h"
#endif #endif

@ -36,8 +36,8 @@
#ifdef COMPILE_TDE_SUPPORT #ifdef COMPILE_TDE_SUPPORT
#include "klibloader.h" #include "klibloader.h"
#include "kparts/part.h" #include "tdeparts/part.h"
#include "kparts/factory.h" #include "tdeparts/factory.h"
extern KviModule * g_pTermModule; extern KviModule * g_pTermModule;
extern KviPointerList<KviTermWidget> * g_pTermWidgetList; extern KviPointerList<KviTermWidget> * g_pTermWidgetList;

@ -31,7 +31,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include "kvi_tal_hbox.h" #include "kvi_tal_hbox.h"
#include "kparts/part.h" #include "tdeparts/part.h"
class KviFrame; class KviFrame;

Loading…
Cancel
Save