Mercurial > dwindows

changeset 880:baf23fa69b99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure change to find webkit with GTK3.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 06 Apr 2011 19:44:49 +0000
parents 6382fd88b49a
children 7b2750744552
files configure.in
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Wed Apr 06 08:30:28 2011 +0000
+++ b/configure.in	Wed Apr 06 19:44:49 2011 +0000
@@ -198,11 +198,13 @@
    if test x"$PKG_CFG" != x; then
       GTK_PACKAGES="gtk+-3.0"
       GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
+      WEBKIT_LIB="webkit-1.1"
       if test x"$GTK_LIBS" = x; then
          GTK_PACKAGES="gtk+-2.0 gthread-2.0"
          GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
       else
          DW_DIR=gtk3
+         WEBKIT_LIB="webkitgtk-3.0"
       fi
       if test $with_gtkmozembed = yes; then
          MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
@@ -218,7 +220,6 @@
          MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
          RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
       else
-         WEBKIT_LIB="webkit-1.1"
          MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
          RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
          if test x"$MOZEMBED_CFLAGS" = x; then