#
# old_revision [595cd288a660326477660b9d9251785e57aaaebe]
#
# add_dir "pidgin/plugins/webkit"
# 
# add_file "pidgin/plugins/webkit/Makefile.am"
#  content [0883764fd5d60c6ed8a8ee844fa3457059d846ea]
# 
# patch "configure.ac"
#  from [3b26612e7eafb66176ebfdaf09f681359fdfca4a]
#    to [6c98779c8fd4dee6d1916de6f4e8371f9be81cd1]
# 
# patch "pidgin/plugins/Makefile.am"
#  from [a6a955c27568aa62774ad96f77de634d93a574c1]
#    to [119a4d9effd2e8e83ea9e008f4631ee49fcbed05]
#
============================================================
--- pidgin/plugins/webkit/Makefile.am	0883764fd5d60c6ed8a8ee844fa3457059d846ea
+++ pidgin/plugins/webkit/Makefile.am	0883764fd5d60c6ed8a8ee844fa3457059d846ea
@@ -0,0 +1,28 @@
+
+webkittemplatedir = $(datadir)/pidgin/webkit
+webkittemplate_DATA = Template.html
+
+webkitdir = $(libdir)/pidgin
+
+webkit_la_LDFLAGS = -module -avoid-version
+
+EXTRA_DIST = $(webkittemplate_DATA)
+
+if PLUGINS
+
+webkit_LTLIBRARIES = webkit.la
+
+webkit_la_SOURCES = webkit.c
+
+endif
+
+webkit_la_LIBADD = $(GTK_LIBS) $(WEBKIT_LIBS)
+
+AM_CPPFLAGS = \
+	-DDATADIR=\"$(datadir)\" \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/pidgin \
+	$(DEBUG_CFLAGS) \
+	$(GTK_CFLAGS) \
+	$(WEBKIT_CFLAGS)
============================================================
--- configure.ac	3b26612e7eafb66176ebfdaf09f681359fdfca4a
+++ configure.ac	6c98779c8fd4dee6d1916de6f4e8371f9be81cd1
@@ -369,6 +369,10 @@ AC_ARG_ENABLE(gestures,
 	[AC_HELP_STRING([--disable-gestures],
 		[compile without the gestures plugin])],
 	enable_gestures="$enableval", enable_gestures="yes")
+AC_ARG_ENABLE(webkit,
+	[AC_HELP_STRING([--enable-webkit],
+		[compile with the WebKit plugin])],
+	enable_webkit="$enableval", enable_webkit="no")
 
 AC_PATH_XTRA
 # We can't assume that $x_libraries will be set, because autoconf does not
@@ -503,6 +507,26 @@ Use --disable-sm if you do not need sess
 	fi
 
 	dnl #######################################################################
+	dnl # Check for WebKit
+	dnl #######################################################################
+	if test "x$enable_webkit" = "xyes"; then
+		PKG_CHECK_MODULES(WEBKIT, [WebKitGtk], ,[
+			AC_MSG_RESULT(no)
+			enable_webkit=no
+		])
+
+		if test "x$enable_webkit" = "xyes"; then
+			AC_DEFINE(HAVE_WEBKIT, 1, [Define if we're using WebKit.])
+			AC_SUBST(WEBKIT_CFLAGS)
+			AC_SUBST(WEBKIT_LIBS)
+		else
+			AC_MSG_ERROR([
+WebKitGtk development headers not found.
+])
+		fi
+	fi
+
+	dnl #######################################################################
 	dnl # Check for startup notification
 	dnl #######################################################################
 	if test "x$enable_startup_notification" = "xyes"; then
@@ -592,6 +616,7 @@ AM_CONDITIONAL(ENABLE_GESTURES, test "x$
 AM_CONDITIONAL(BUILD_GEVOLUTION, test "x$enable_gevolution" = "xyes")
 AM_CONDITIONAL(ENABLE_CAP, test "x$enable_cap" = "xyes")
 AM_CONDITIONAL(ENABLE_GESTURES, test "x$enable_gestures" = "xyes")
+AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
 
 
 dnl #######################################################################
@@ -2347,6 +2372,7 @@ AC_OUTPUT([Makefile
 		   pidgin/plugins/perl/Makefile
 		   pidgin/plugins/perl/common/Makefile.PL
 		   pidgin/plugins/ticker/Makefile
+		   pidgin/plugins/webkit/Makefile
 		   libpurple/example/Makefile
 		   libpurple/gconf/Makefile
 		   libpurple/purple.pc
@@ -2403,6 +2429,7 @@ echo Enable Gestures............... : $e
 echo Build for X11................. : $with_x
 echo
 echo Enable Gestures............... : $enable_gestures
+echo Enable WebKit................. : $enable_webkit
 echo Protocols to build dynamically : $DYNAMIC_PRPLS
 echo Protocols to link statically.. : $STATIC_PRPLS
 echo
============================================================
--- pidgin/plugins/Makefile.am	a6a955c27568aa62774ad96f77de634d93a574c1
+++ pidgin/plugins/Makefile.am	119a4d9effd2e8e83ea9e008f4631ee49fcbed05
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = cap gestures gevolution musicmessaging perl ticker webkit
 
 if BUILD_GEVOLUTION
 GEVOLUTION_DIR = gevolution
@@ -20,12 +20,17 @@ endif
 GESTURE_DIR = gestures
 endif
 
+if ENABLE_WEBKIT
+WEBKIT_DIR = webkit
+endif
+
 SUBDIRS = \
 	$(CAP_DIR) \
 	$(GESTURE_DIR) \
 	$(GEVOLUTION_DIR) \
 	$(MUSICMESSAGING_DIR) \
 	$(PERL_DIR) \
+	$(WEBKIT_DIR) \
 	ticker
 
 plugindir = $(libdir)/pidgin