Build fix: Webkit's header and pkgconfig name have changed.
This commit is contained in:
parent
65535e1d87
commit
25ac3e9932
6 changed files with 10 additions and 10 deletions
10
configure.in
10
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)
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "../katze/katze.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <webkit.h>
|
||||
#include <webkit/webkit.h>
|
||||
|
||||
// -- globals
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
#include "../katze/katze.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <webkit.h>
|
||||
#include <webkit/webkit.h>
|
||||
|
||||
GtkIconTheme* get_icon_theme(GtkWidget* widget)
|
||||
{
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include <string.h>
|
||||
#include <gtk/gtk.h>
|
||||
#include <webkit.h>
|
||||
#include <webkit/webkit.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
#include <libsexy/sexy.h>
|
||||
#include <webkit.h>
|
||||
#include <webkit/webkit.h>
|
||||
|
||||
// -- Types
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue