From 25ac3e993227af16cfc868d2de60b824e195dc78 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 3 Feb 2008 10:51:35 +0100 Subject: [PATCH] Build fix: Webkit's header and pkgconfig name have changed. --- configure.in | 10 +++++----- src/global.h | 2 +- src/helpers.c | 2 +- src/main.c | 2 +- src/webSearch.h | 2 +- src/webView.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index 913f2b01..dc257970 100644 --- 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 de9ea3ef..868ebd68 100644 --- a/src/global.h +++ b/src/global.h @@ -16,7 +16,7 @@ #include "../katze/katze.h" #include -#include +#include // -- globals diff --git a/src/helpers.c b/src/helpers.c index 2b824757..04b66837 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -16,7 +16,7 @@ #include "../katze/katze.h" #include -#include +#include GtkIconTheme* get_icon_theme(GtkWidget* widget) { diff --git a/src/main.c b/src/main.c index 7fe43c20..55e23485 100755 --- a/src/main.c +++ b/src/main.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include "config.h" diff --git a/src/webSearch.h b/src/webSearch.h index 09f31222..3cefc395 100644 --- a/src/webSearch.h +++ b/src/webSearch.h @@ -16,7 +16,7 @@ #include #include -#include +#include // -- Types diff --git a/src/webView.h b/src/webView.h index 262a5e42..552b571b 100644 --- a/src/webView.h +++ b/src/webView.h @@ -16,7 +16,7 @@ #include "browser.h" #include "debug.h" -#include +#include WebKitNavigationResponse on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame