summaryrefslogtreecommitdiffstats
path: root/aclocal.m4
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:09:53 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:09:53 -0600
commit4b84e49ae594a5e7abe92b6a7e1b1f92c2565834 (patch)
tree852b5b4a298666b499d96e324e88ff71a8da993c /aclocal.m4
parent35676c0c2e0844ba8429771708c8a04a3314338f (diff)
downloadknights-4b84e49ae594a5e7abe92b6a7e1b1f92c2565834.tar.gz
knights-4b84e49ae594a5e7abe92b6a7e1b1f92c2565834.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m416
1 files changed, 8 insertions, 8 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 430d7d2..5168596 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1973,9 +1973,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
@@ -1984,13 +1984,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+ AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2402,7 +2402,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then