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

master
Timothy Pearson 12 years ago
parent b78c479ce5
commit 22d5a332d6

@ -646,7 +646,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
@ -1967,7 +1967,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
@ -2313,7 +2313,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")
@ -2323,7 +2323,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
]) ])

8
aclocal.m4 vendored

@ -614,7 +614,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
@ -1800,7 +1800,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
@ -2106,7 +2106,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")
@ -2116,7 +2116,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
]) ])

@ -3,7 +3,7 @@
#include <tqtextbrowser.h> #include <tqtextbrowser.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <klocale.h> #include <klocale.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <cmath> #include <cmath>

@ -7,8 +7,8 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <ktoolbarbutton.h> #include <ktoolbarbutton.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kfiledetailview.h> #include <tdefiledetailview.h>
#include <kapplication.h> #include <kapplication.h>
#include <adept/lister.h> #include <adept/lister.h>

@ -475,7 +475,7 @@
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KFileDetailView</class> <class>KFileDetailView</class>
<header location="global">kfiledetailview.h</header> <header location="global">tdefiledetailview.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>-1</height> <height>-1</height>
@ -500,7 +500,7 @@
<includehint>ktoolbar.h</includehint> <includehint>ktoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint> <includehint>adept/packageinfo.h</includehint>
<includehint>adept/lister.h</includehint> <includehint>adept/lister.h</includehint>
<includehint>kfiledetailview.h</includehint> <includehint>tdefiledetailview.h</includehint>
<includehint>adept/tagchooser.h</includehint> <includehint>adept/tagchooser.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -18,12 +18,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <kurl.h> #include <kurl.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kprocess.h> #include <kprocess.h>
#include <klocale.h> #include <klocale.h>
#include <kglobal.h> #include <kglobal.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <ktar.h> #include <ktar.h>
#include <kdebug.h> #include <kdebug.h>

@ -7,8 +7,8 @@
#include <ktoolbar.h> #include <ktoolbar.h>
#include <ktoolbarbutton.h> #include <ktoolbarbutton.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <kfiledetailview.h> #include <tdefiledetailview.h>
#include <kapplication.h> #include <kapplication.h>
#include <adept/lister.h> #include <adept/lister.h>

@ -433,7 +433,7 @@
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KFileDetailView</class> <class>KFileDetailView</class>
<header location="global">kfiledetailview.h</header> <header location="global">tdefiledetailview.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>
<height>-1</height> <height>-1</height>
@ -458,7 +458,7 @@
<includehint>ktoolbar.h</includehint> <includehint>ktoolbar.h</includehint>
<includehint>adept/packageinfo.h</includehint> <includehint>adept/packageinfo.h</includehint>
<includehint>adept/lister.h</includehint> <includehint>adept/lister.h</includehint>
<includehint>kfiledetailview.h</includehint> <includehint>tdefiledetailview.h</includehint>
<includehint>adept/tagchooser.h</includehint> <includehint>adept/tagchooser.h</includehint>
</includehints> </includehints>
</UI> </UI>

@ -15,7 +15,7 @@
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kaction.h> #include <kaction.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kpassivepopup.h> #include <kpassivepopup.h>
#include <kiconloader.h> #include <kiconloader.h>

Loading…
Cancel
Save