summaryrefslogtreecommitdiffstats
path: root/aclocal.m4
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 00:53:45 -0600
committerTimothy Pearson <[email protected]>2013-01-27 00:53:45 -0600
commiteaf494a96cbd8419447ddf2c0edda0c5bee4f843 (patch)
tree6d3c6eb4cf5ea88f2b097923180bfdf963d4d456 /aclocal.m4
parent6f12d4eaa7c376a519b74863cdae8f7e50112bff (diff)
downloadknetload-eaf494a96cbd8419447ddf2c0edda0c5bee4f843.tar.gz
knetload-eaf494a96cbd8419447ddf2c0edda0c5bee4f843.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m48
1 files changed, 4 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index d3c65d7..803462f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -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
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1753,7 +1753,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
@@ -2049,7 +2049,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")
@@ -2059,7 +2059,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
])