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

---
 acinclude.m4           | 4 ++--
 cmake                  | 2 +-
 src/piklab/Makefile.am | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 74491ad..91d39f4 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/src/piklab/Makefile.am b/src/piklab/Makefile.am
index eb8b29b..9fc4f84 100644
--- a/src/piklab/Makefile.am
+++ b/src/piklab/Makefile.am
@@ -57,7 +57,7 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \
 	$(top_builddir)/src/devices/mem24/mem24/libmem24.la $(top_builddir)/src/devices/mem24/base/libmem24base.la \
 	$(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \
 	$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
-piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
+piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_KIO)
 piklab_DEPENDENCIES = $(OBJS)
 piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 piklab_SOURCES = main.cpp
-- 
cgit v1.2.3