Makefile and CMakelist changes converting the package build
from libgtkhtml to libwebkit.
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -6,7 +6,7 @@
 IF(NOT WIN32)
 	INCLUDE(FindPkgConfig)
 	PKG_CHECK_MODULES(GTK "gtk+-2.0")
-	PKG_CHECK_MODULES(GTKHTML "libgtkhtml-2.0")
+	PKG_CHECK_MODULES(GTK_WEBKIT "webkit-1.0")
 ENDIF(NOT WIN32)
 
 ADD_SUBDIRECTORY(tools)
--- a/app/bin/Makefile
+++ b/app/bin/Makefile
@@ -83,7 +83,7 @@
 WLIBS = $(WLIB)/gtklib/gtk2lib$(VER).a
 
 #GTKLIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -lglib-2.0 -lpango-1.0
-GTKLIBS = `pkg-config --libs libgtkhtml-2.0`
+GTKLIBS = `pkg-config --libs webkit-1.0`
 XLIBS = -L/usr/X11R6/lib -lX11
 
 LIBS = $(WLIBS) $(GTKLIBS) $(XLIBS) -lm
--- a/app/wlib/gtklib/CMakeLists.txt
+++ b/app/wlib/gtklib/CMakeLists.txt
@@ -4,7 +4,7 @@
 SET_SOURCE_FILES_PROPERTIES(wpref.c PROPERTIES COMPILE_FLAGS -DEXPORT=)
 
 INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${GTKHTML_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${GTK_WEBKIT_INCLUDE_DIRS})
 
 ADD_LIBRARY(xtrackcad-wlib SHARED ${HEADERS} ${SOURCES})
 
--- a/app/wlib/gtklib/Makefile
+++ b/app/wlib/gtklib/Makefile
@@ -2,7 +2,7 @@
 # $Header: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/Makefile,v 1.7 2007/11/12 18:53:15 m_fischer Exp $
 #
 
-GTKINCL=`pkg-config --cflags libgtkhtml-2.0`
+GTKINCL=`pkg-config --cflags webkit-1.0`
 
 COPTS = -Wall
 CINCLS = -I../include $(GTKINCL)
@@ -29,7 +29,7 @@
 	wpref.o \
 	psprint.o 
 
-LIBS = `pkg-config --libs libgtkhtml-2.0`
+LIBS = `pkg-config --libs webkit-1.0`
 
 CSRCS = $(OBJS:.o=.c)
 HDRS = gtkint.h dynarr.h
