Mercurial > dwindows

comparison configure.in @ 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 5ec50e403a8a
children c4dae8a3cf9a
comparison
equal deleted inserted replaced
879:6382fd88b49a 880:baf23fa69b99
196 if test $build_gtk = "yes"; then 196 if test $build_gtk = "yes"; then
197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) 197 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
198 if test x"$PKG_CFG" != x; then 198 if test x"$PKG_CFG" != x; then
199 GTK_PACKAGES="gtk+-3.0" 199 GTK_PACKAGES="gtk+-3.0"
200 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 200 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
201 WEBKIT_LIB="webkit-1.1"
201 if test x"$GTK_LIBS" = x; then 202 if test x"$GTK_LIBS" = x; then
202 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 203 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
203 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 204 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
204 else 205 else
205 DW_DIR=gtk3 206 DW_DIR=gtk3
207 WEBKIT_LIB="webkitgtk-3.0"
206 fi 208 fi
207 if test $with_gtkmozembed = yes; then 209 if test $with_gtkmozembed = yes; then
208 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` 210 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed`
209 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` 211 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed`
210 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` 212 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-`
216 elif test $with_gtkhtml = yes; then 218 elif test $with_gtkhtml = yes; then
217 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` 219 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0`
218 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` 220 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0`
219 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` 221 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-`
220 else 222 else
221 WEBKIT_LIB="webkit-1.1"
222 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 223 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`
223 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-` 224 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_LIB | cut -b 3-`
224 if test x"$MOZEMBED_CFLAGS" = x; then 225 if test x"$MOZEMBED_CFLAGS" = x; then
225 WEBKIT_LIB="webkit-1.0" 226 WEBKIT_LIB="webkit-1.0"
226 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB` 227 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_LIB`