summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m44
m---------cmake0
-rw-r--r--kdiff3plugin/po/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index bbfb8c4..ceba796 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2075,7 +2075,7 @@ 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, "-ltdehtml")
+ AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2096,7 +2096,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
diff --git a/cmake b/cmake
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index 65a2359..98468ef 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -148,7 +148,7 @@ LIB_TDEUI = -ltdeui
LIB_KDNSSD = -ltdednssd
LIB_KFILE = -lkio
LIB_KFM =
-LIB_KHTML = -ltdehtml
+LIB_TDEHTML = -ltdehtml
LIB_KIMPROXY = -ltdeimproxy
LIB_KIO = -lkio
LIB_KJS = -lkjs