Mercurial > dwindows

comparison configure.in @ 2747:c83d6261ce3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK4: Change configure tests, and try to support webkit. Try gtk4-x11 first then just gtk4 (wayland)... so if the X11 version is available we can use Xlib functions if on the X11 backend. If requesting GTK4 use webkitgtk-5.0 the package reported for GTK4. I was unable to build webkit for GTK4 due to dependency nightmares. Will try to build it on Fedora and see if I can actuall test this.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 27 Dec 2021 14:03:33 +0000
parents 0ce46809e95d
children d8db838d5616
comparison
equal deleted inserted replaced
2746:0ce46809e95d 2747:c83d6261ce3e
217 if test $with_gtk2 = "yes"; then 217 if test $with_gtk2 = "yes"; then
218 DW_DIR=gtk 218 DW_DIR=gtk
219 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 219 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
220 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 220 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
221 fi 221 fi
222 # Default WebKitGTK test is 4.0 for GTK3
223 WEBKIT_PKG="webkit2gtk-4.0"
222 if test $with_gtk4 = "yes"; then 224 if test $with_gtk4 = "yes"; then
223 DW_DIR=gtk4 225 DW_DIR=gtk4
224 GTK_PACKAGES="gtk4" 226 # First try the X11 version so we can call Xlib directly
227 # to fill in the holes not available with Wayland
228 GTK_PACKAGES="gtk4-x11"
225 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 229 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
226 fi 230 if test x"$GTK_LIBS" = x; then
227 WEBKIT_PKG="webkit2gtk-4.0" 231 GTK_PACKAGES="gtk4"
232 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
233 fi
234 # WebKitGTK built for GTK4 becomes 5.0
235 WEBKIT_PKG="webkitgtk-5.0"
236 fi
228 if test x"$GTK_LIBS" = x; then 237 if test x"$GTK_LIBS" = x; then
229 GTK_PACKAGES="gtk+-3.0" 238 GTK_PACKAGES="gtk+-3.0"
230 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 239 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
231 else 240 else
232 WEBKIT_PKG="webkit-1.1" 241 WEBKIT_PKG="webkit-1.1"