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

pull/1/head
Timothy Pearson 12 years ago
parent 5272df885c
commit ff2557dc4f

@ -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
])

@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(compizconfig-backend-kconfig, 0.7.3) dnl searches for some needed programs
AM_INIT_AUTOMAKE(compizconfig-backend-tdeconfig, 0.7.3) dnl searches for some needed programs
KDE_SET_PREFIX

@ -1,6 +1,6 @@
#MIN_CONFIG
KDE_ENABLE_HIDDEN_VISIBILITY
AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.4)
AM_INIT_AUTOMAKE(compizconfig-backend-tdeconfig,0.8.4)
AC_CHECK_RANDOM
AC_CHECK_USLEEP

@ -1,12 +1,12 @@
INCLUDES = -I$(srcdir)/lib $(all_includes)
libkconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
libkconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE)
libkconfig_la_SOURCES = kconfig_backend.cpp
libtdeconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
libtdeconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE)
libtdeconfig_la_SOURCES = tdeconfig_backend.cpp
backenddir = $(BACKENDDIR)/backends
KDE_CXXFLAGS = $(CCS_CFLAGS)
METASOURCES = AUTO
backend_LTLIBRARIES = libkconfig.la
backend_LTLIBRARIES = libtdeconfig.la

@ -21,7 +21,7 @@
#include <tqdir.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kglobal.h>
@ -610,7 +610,7 @@ static CCSStringList
getExistingProfiles (CCSContext *)
{
if (!instance)
instance = new TDEInstance ("ccs-backend-kconfig");
instance = new TDEInstance ("ccs-backend-tdeconfig");
TQDir dir (TDEGlobal::dirs()->saveLocation ("config", TQString(), false),
"compizrc.*");
@ -1760,7 +1760,7 @@ static Bool
readInit (CCSContext *c)
{
if (!instance)
instance = new TDEInstance ("ccs-backend-kconfig");
instance = new TDEInstance ("ccs-backend-tdeconfig");
if (cFiles->profile != ccsGetProfile (c) )
{
@ -1796,7 +1796,7 @@ static Bool
writeInit (CCSContext *c)
{
if (!instance)
instance = new TDEInstance ("ccs-backend-kconfig");
instance = new TDEInstance ("ccs-backend-tdeconfig");
if (cFiles->profile != ccsGetProfile (c) )
{
@ -1853,7 +1853,7 @@ static Bool
init (CCSContext *c)
{
if (!instance)
instance = new TDEInstance ("ccs-backend-kconfig");
instance = new TDEInstance ("ccs-backend-tdeconfig");
cFiles = new ConfigFiles;
@ -1938,9 +1938,9 @@ deleteProfile (CCSContext *,
return FALSE;
}
static CCSBackendVTable kconfigVTable =
static CCSBackendVTable tdeconfigVTable =
{
"kconfig",
"tdeconfig",
"KDE Configuration Backend",
"KDE Configuration Backend for libccs",
true,
@ -1966,7 +1966,7 @@ extern "C"
CCSBackendVTable *
getBackendInfo (void)
{
return &kconfigVTable;
return &tdeconfigVTable;
}
}
Loading…
Cancel
Save