Mercurial > dwindows
comparison configure.in @ 2267:7ac85e938b71
GTK4: Don't try to link webkit on GTK4... it doesn't support it yet.
Also fix various issues with fonts, signals and implement dialogs.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 31 Jan 2021 02:54:40 +0000 |
parents | 5c981407b0f3 |
children | 829228de003f |
comparison
equal
deleted
inserted
replaced
2266:bb0690c04413 | 2267:7ac85e938b71 |
---|---|
247 else | 247 else |
248 AC_DEFINE(USE_WEBKIT10) | 248 AC_DEFINE(USE_WEBKIT10) |
249 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | 249 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` |
250 fi | 250 fi |
251 else | 251 else |
252 WEBKIT_PKG="webkitgtk-3.0" | 252 if test $DW_DIR = "gtk3"; then |
253 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 253 WEBKIT_PKG="webkitgtk-3.0" |
254 if test x"$WEBKIT_CFLAGS" = x; then | |
255 WEBKIT_PKG="webkitgtk-1.0" | |
256 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 254 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
257 if test x"$WEBKIT_CFLAGS" = x; then | 255 if test x"$WEBKIT_CFLAGS" = x; then |
258 AC_DEFINE(USE_WEBKIT10) | 256 WEBKIT_PKG="webkitgtk-1.0" |
257 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
258 if test x"$WEBKIT_CFLAGS" = x; then | |
259 AC_DEFINE(USE_WEBKIT10) | |
260 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
261 fi | |
262 else | |
263 AC_DEFINE(USE_WEBKIT11) | |
259 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | 264 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` |
260 fi | 265 fi |
261 else | |
262 AC_DEFINE(USE_WEBKIT11) | |
263 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
264 fi | 266 fi |
265 fi | 267 fi |
266 else | 268 else |
267 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | 269 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` |
268 if test $with_gtk2 = "yes"; then | 270 if test $with_gtk2 = "yes"; then |