summaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:12:36 -0600
commitd2107b329f3eadbd4c193a21704fa6d4eedc0ed0 (patch)
tree78a4b23499d3e2319093af800445cd9df9554516 /acinclude.m4
parentd46a1fe34693137bbc38a0a79593af420ea0914b (diff)
downloadktorrent-d2107b329f3eadbd4c193a21704fa6d4eedc0ed0.tar.gz
ktorrent-d2107b329f3eadbd4c193a21704fa6d4eedc0ed0.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m426
1 files changed, 13 insertions, 13 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index d6a7783..235078b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2099,16 +2099,16 @@ 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")
- AC_SUBST(LIB_KUTILS, "-lkutils")
+ AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
- AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+ AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@@ -2116,13 +2116,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)")
@@ -2571,7 +2571,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
@@ -3514,7 +3514,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)