Build fix: Webkit's header and pkgconfig name have changed.

diff --git a/configure.in b/configure.in
index 913f2b0164b66fac729ba8f3a24726a3d6da1a40..dc257970c61a3266f97f265a1109d2f1608281f0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,15 +52,15 @@ AC_SUBST(GTK_LIBS)
 GTK_VER=`pkg-config --modversion gtk+-2.0`
 AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
 
-# Checks for WebKitGtk
-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
+# Checks for WebKit
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
 if test "x${have_webkit}" = "xfalse" ; then
-    AC_MSG_ERROR([No WebKitGtk package information found])
+    AC_MSG_ERROR([No WebKit package information found])
 fi
 AC_SUBST(WEBKIT_CFLAGS)
 AC_SUBST(WEBKIT_LIBS)
-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
-AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
+WEBKIT_VER=`pkg-config --modversion webkit-1.0`
+AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKIT_VER", [WebKit version])
 
 # Checks for libsexy
 PKG_CHECK_MODULES(LIBSEXY, libsexy, have_libsexy=true, have_libsexy=false)

diff --git a/src/global.h b/src/global.h
index de9ea3efc69d56db8a335e2532721031e85c64a3..868ebd68525a8495400584ff023be97328fb4dc3 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -16,7 +16,7 @@
 #include "../katze/katze.h"
 
 #include <gtk/gtk.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 // -- globals
 

diff --git a/src/helpers.c b/src/helpers.c
index 2b82475749afb4dbbac26b296e64c453516003a0..04b668374df3480d0f6be1f1471b04a3aa0f42b6 100644 (file)
--- a/src/helpers.c
+++ b/src/helpers.c
@@ -16,7 +16,7 @@
 #include "../katze/katze.h"
 
 #include <string.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 GtkIconTheme* get_icon_theme(GtkWidget* widget)
 {

diff --git a/src/main.c b/src/main.c
index 7fe43c20b9bd8b7bfd3261eecd1eae630eaf74bd..55e2348531ea576ff0bf33e3d5b70ba137b0e27a 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 #include "config.h"
 

diff --git a/src/webSearch.h b/src/webSearch.h
index 09f31222abf9d85207bc64a8f0d3c270098598a0..3cefc395755495ddbb5cb6170fe4bfffa1a570dc 100644 (file)
--- a/src/webSearch.h
+++ b/src/webSearch.h
@@ -16,7 +16,7 @@
 
 #include <gtk/gtk.h>
 #include <libsexy/sexy.h>
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 // -- Types
 

diff --git a/src/webView.h b/src/webView.h
index 262a5e4282e89ad87c4fbc6aecb862c6e3aaa68e..552b571b1993e086dd8cf04b96514201afae5e2f 100644 (file)
--- a/src/webView.h
+++ b/src/webView.h
@@ -16,7 +16,7 @@
 #include "browser.h"
 #include "debug.h"
 
-#include <webkit.h>
+#include <webkit/webkit.h>
 
 WebKitNavigationResponse
 on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame