summaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:55:52 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:55:52 -0600
commita2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8 (patch)
treef3b247a73eacb6ce11aff9beea65c4c159a3a551 /acinclude.m4
parente25fe07beb129ca34871e330e7e1b6aa35606665 (diff)
downloadksystemlog-a2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8.tar.gz
ksystemlog-a2eb3bdf7452bf39fe829ffc9a0309c2324c3ec8.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index ccfe24d..950f4ca 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -572,7 +572,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
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
@@ -1733,7 +1733,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
@@ -2029,7 +2029,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")
@@ -2039,7 +2039,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
])