From 0cb1f632975f2e09f3edab38275c80077298ae47 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 20:55:55 -0600
Subject: Rename kiobuffer and KHTML

---
 acinclude.m4             | 4 ++--
 cmake                    | 2 +-
 kdiff3plugin/po/Makefile | 2 +-
 3 files changed, 4 insertions(+), 4 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
index 9a21790..274366f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
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
-- 
cgit v1.2.1