comparison configure @ 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
5513 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h 5513 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
5514 5514
5515 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` 5515 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
5516 fi 5516 fi
5517 else 5517 else
5518 WEBKIT_PKG="webkitgtk-3.0" 5518 if test $DW_DIR = "gtk3"; then
5519 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 5519 WEBKIT_PKG="webkitgtk-3.0"
5520 if test x"$WEBKIT_CFLAGS" = x; then
5521 WEBKIT_PKG="webkitgtk-1.0"
5522 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 5520 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
5523 if test x"$WEBKIT_CFLAGS" = x; then 5521 if test x"$WEBKIT_CFLAGS" = x; then
5524 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h 5522 WEBKIT_PKG="webkitgtk-1.0"
5523 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
5524 if test x"$WEBKIT_CFLAGS" = x; then
5525 $as_echo "#define USE_WEBKIT10 1" >>confdefs.h
5526
5527 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
5528 fi
5529 else
5530 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
5525 5531
5526 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` 5532 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
5527 fi 5533 fi
5528 else
5529 $as_echo "#define USE_WEBKIT11 1" >>confdefs.h
5530
5531 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
5532 fi 5534 fi
5533 fi 5535 fi
5534 else 5536 else
5535 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` 5537 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG`
5536 if test $with_gtk2 = "yes"; then 5538 if test $with_gtk2 = "yes"; then