comparison configure.ac @ 2978:d84182f0054e

GTK4: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE. Also add support for the stable WebKitGTK 6.0 for GTK4. They changed a lot including the package name, add USE_WEBKIT6 for this.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 24 Mar 2023 23:04:39 +0000
parents 83c17a84bc27
children a464a74505f7
comparison
equal deleted inserted replaced
2977:7d6773c474d0 2978:d84182f0054e
229 GTK_PACKAGES="gtk4" 229 GTK_PACKAGES="gtk4"
230 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 230 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
231 fi 231 fi
232 if test x"$GTK_LIBS" != x; then 232 if test x"$GTK_LIBS" != x; then
233 DW_DIR=gtk4 233 DW_DIR=gtk4
234 # WebKit2GTK built for GTK4 becomes 5.0 234 # WebKit2GTK built for GTK4 becomes 5.0 or 6.0
235 WEBKIT_PKG="webkit2gtk-5.0" 235 WEBKIT_PKG="webkitgtk-6.0"
236 WEBKIT_ALT_PKG="webkit2gtk-5.0"
236 fi 237 fi
237 else 238 else
238 # Put the GTK2 test here since --with-gtk2 is mutually 239 # Put the GTK2 test here since --with-gtk2 is mutually
239 # exclusive with --with-gtk4 240 # exclusive with --with-gtk4
240 if test $with_gtk2 = "yes"; then 241 if test $with_gtk2 = "yes"; then
279 if test "$WEBKIT_PKG" = "webkit-1.1"; then 280 if test "$WEBKIT_PKG" = "webkit-1.1"; then
280 AC_DEFINE(USE_WEBKIT11,1,Uses WebKit 1.1) 281 AC_DEFINE(USE_WEBKIT11,1,Uses WebKit 1.1)
281 fi 282 fi
282 if test "$WEBKIT_PKG" = "webkit2gtk-4.0"; then 283 if test "$WEBKIT_PKG" = "webkit2gtk-4.0"; then
283 AC_DEFINE(USE_WEBKIT2,1,Uses WebKit 2) 284 AC_DEFINE(USE_WEBKIT2,1,Uses WebKit 2)
285 fi
286 if test "$WEBKIT_PKG" = "webkitgtk-6.0"; then
287 AC_DEFINE(USE_WEBKIT6,1,Uses WebKit 6)
284 fi 288 fi
285 fi 289 fi
286 if test x"$RPATH" != x; then 290 if test x"$RPATH" != x; then
287 RPATH="-Wl,-R$RPATH" 291 RPATH="-Wl,-R$RPATH"
288 fi 292 fi