Browse Source

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

pull/1/head
Timothy Pearson 10 years ago
parent
commit
d4f473cfdc
  1. 6
      acinclude.m4
  2. 6
      aclocal.m4
  3. 2
      kcpuload/kcpuload/kcpuload.cpp
  4. 2
      kcpuload/kcpuload/statpopup.cpp

6
acinclude.m4

@ -1610,7 +1610,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
@ -1928,7 +1928,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")
@ -1938,7 +1938,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
])

6
aclocal.m4 vendored

@ -1622,7 +1622,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
@ -1940,7 +1940,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")
@ -1950,7 +1950,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
])

2
kcpuload/kcpuload/kcpuload.cpp

@ -17,7 +17,7 @@
#include "kcpuproc.h"
#include <kaction.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kpopupmenu.h>

2
kcpuload/kcpuload/statpopup.cpp

@ -20,7 +20,7 @@
#include <tqtimer.h>
#include <kaction.h>
#include <kcolordialog.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <khelpmenu.h>

Loading…
Cancel
Save