comparison configure @ 2264:5c981407b0f3

GTK4: Add experimental support for GTK4... This is in progress and doesn't compile yet. GTK4 support will likely be less full than GTK3 due to architectural decisions by the GTK team. Certain features have been removed with no replacements, such as status icon support. Additionally all of the thread safety has been removed and everything MUST run on the main thread. I will likely implement a similar solution to what I did on MacOS where threads will call into the main thread to do API calls, passing the arguments between threads. Copied from GTK3 removing all existing now dead thread safety, all deprecated code and everything supporting earlier versions of GTK3. GTK4 is not available in any mainstream distributions yet... hoping to have it at least functional by the time there are any.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 29 Jan 2021 10:57:12 +0000
parents 4020bdb806dc
children 7ac85e938b71
comparison
equal deleted inserted replaced
2263:176470d75695 2264:5c981407b0f3
714 htmldir 714 htmldir
715 infodir 715 infodir
716 docdir 716 docdir
717 oldincludedir 717 oldincludedir
718 includedir 718 includedir
719 runstatedir
719 localstatedir 720 localstatedir
720 sharedstatedir 721 sharedstatedir
721 sysconfdir 722 sysconfdir
722 datadir 723 datadir
723 datarootdir 724 datarootdir
738 ac_subst_files='' 739 ac_subst_files=''
739 ac_user_opts=' 740 ac_user_opts='
740 enable_option_checking 741 enable_option_checking
741 with_dwcompat 742 with_dwcompat
742 with_gtk2 743 with_gtk2
744 with_gtk4
743 with_deprecated 745 with_deprecated
744 with_arch 746 with_arch
745 with_sdk 747 with_sdk
746 with_minver 748 with_minver
747 with_x 749 with_x
809 datarootdir='${prefix}/share' 811 datarootdir='${prefix}/share'
810 datadir='${datarootdir}' 812 datadir='${datarootdir}'
811 sysconfdir='${prefix}/etc' 813 sysconfdir='${prefix}/etc'
812 sharedstatedir='${prefix}/com' 814 sharedstatedir='${prefix}/com'
813 localstatedir='${prefix}/var' 815 localstatedir='${prefix}/var'
816 runstatedir='${localstatedir}/run'
814 includedir='${prefix}/include' 817 includedir='${prefix}/include'
815 oldincludedir='/usr/include' 818 oldincludedir='/usr/include'
816 docdir='${datarootdir}/doc/${PACKAGE}' 819 docdir='${datarootdir}/doc/${PACKAGE}'
817 infodir='${datarootdir}/info' 820 infodir='${datarootdir}/info'
818 htmldir='${docdir}' 821 htmldir='${docdir}'
1061 1064
1062 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 1065 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1063 | -silent | --silent | --silen | --sile | --sil) 1066 | -silent | --silent | --silen | --sile | --sil)
1064 silent=yes ;; 1067 silent=yes ;;
1065 1068
1069 -runstatedir | --runstatedir | --runstatedi | --runstated \
1070 | --runstate | --runstat | --runsta | --runst | --runs \
1071 | --run | --ru | --r)
1072 ac_prev=runstatedir ;;
1073 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1074 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1075 | --run=* | --ru=* | --r=*)
1076 runstatedir=$ac_optarg ;;
1077
1066 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1078 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1067 ac_prev=sbindir ;; 1079 ac_prev=sbindir ;;
1068 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 1080 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
1069 | --sbi=* | --sb=*) 1081 | --sbi=* | --sb=*)
1070 sbindir=$ac_optarg ;; 1082 sbindir=$ac_optarg ;;
1198 1210
1199 # Check all directory arguments for consistency. 1211 # Check all directory arguments for consistency.
1200 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1212 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1201 datadir sysconfdir sharedstatedir localstatedir includedir \ 1213 datadir sysconfdir sharedstatedir localstatedir includedir \
1202 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1214 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1203 libdir localedir mandir 1215 libdir localedir mandir runstatedir
1204 do 1216 do
1205 eval ac_val=\$$ac_var 1217 eval ac_val=\$$ac_var
1206 # Remove trailing slashes. 1218 # Remove trailing slashes.
1207 case $ac_val in 1219 case $ac_val in
1208 */ ) 1220 */ )
1351 --sbindir=DIR system admin executables [EPREFIX/sbin] 1363 --sbindir=DIR system admin executables [EPREFIX/sbin]
1352 --libexecdir=DIR program executables [EPREFIX/libexec] 1364 --libexecdir=DIR program executables [EPREFIX/libexec]
1353 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1365 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1354 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1366 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1355 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1367 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1368 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1356 --libdir=DIR object code libraries [EPREFIX/lib] 1369 --libdir=DIR object code libraries [EPREFIX/lib]
1357 --includedir=DIR C header files [PREFIX/include] 1370 --includedir=DIR C header files [PREFIX/include]
1358 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1371 --oldincludedir=DIR C header files for non-gcc [/usr/include]
1359 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] 1372 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1360 --datadir=DIR read-only architecture-independent data [DATAROOTDIR] 1373 --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
1396 Optional Packages: 1409 Optional Packages:
1397 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] 1410 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1398 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1411 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1399 --with-dwcompat specify this to build the optional dwcompat library 1412 --with-dwcompat specify this to build the optional dwcompat library
1400 --with-gtk2 specify this to build with GTK+ 2.x if available 1413 --with-gtk2 specify this to build with GTK+ 2.x if available
1414 --with-gtk4 specify this to build with GTK+ 4.x if available
1401 --with-deprecated specify this to build with deprecated functions 1415 --with-deprecated specify this to build with deprecated functions
1402 --with-arch specify MacOS architecture: one of modern, classic, 32bit, intel, arm, powerpc 1416 --with-arch specify MacOS architecture: one of modern, classic, 32bit, intel, arm, powerpc
1403 --with-sdk specify this to build with an alternate MacOS SDK location 1417 --with-sdk specify this to build with an alternate MacOS SDK location
1404 --with-minver specify this to build with a minimum MacOS version 1418 --with-minver specify this to build with a minimum MacOS version
1405 --with-x use the X Window System 1419 --with-x use the X Window System
3685 # Check whether --with-gtk2 was given. 3699 # Check whether --with-gtk2 was given.
3686 if test "${with_gtk2+set}" = set; then : 3700 if test "${with_gtk2+set}" = set; then :
3687 withval=$with_gtk2; with_gtk2=$withval 3701 withval=$with_gtk2; with_gtk2=$withval
3688 else 3702 else
3689 with_gtk2=no 3703 with_gtk2=no
3704 fi
3705
3706
3707
3708 # Check whether --with-gtk4 was given.
3709 if test "${with_gtk4+set}" = set; then :
3710 withval=$with_gtk4; with_gtk4=$withval
3711 else
3712 with_gtk4=no
3690 fi 3713 fi
3691 3714
3692 3715
3693 3716
3694 # Check whether --with-deprecated was given. 3717 # Check whether --with-deprecated was given.
5455 5478
5456 5479
5457 if test x"$PKG_CFG" != x; then 5480 if test x"$PKG_CFG" != x; then
5458 GTK_LIBS="" 5481 GTK_LIBS=""
5459 if test $with_gtk2 = "yes"; then 5482 if test $with_gtk2 = "yes"; then
5483 DW_DIR=gtk
5460 GTK_PACKAGES="gtk+-2.0 gthread-2.0" 5484 GTK_PACKAGES="gtk+-2.0 gthread-2.0"
5485 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
5486 fi
5487 if test $with_gtk4 = "yes"; then
5488 DW_DIR=gtk4
5489 GTK_PACKAGES="gtk4"
5461 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 5490 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
5462 fi 5491 fi
5463 WEBKIT_PKG="webkit2gtk-4.0" 5492 WEBKIT_PKG="webkit2gtk-4.0"
5464 if test x"$GTK_LIBS" = x; then 5493 if test x"$GTK_LIBS" = x; then
5465 GTK_PACKAGES="gtk+-3.0" 5494 GTK_PACKAGES="gtk+-3.0"
5466 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` 5495 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES`
5467 else 5496 else
5468 DW_DIR=gtk
5469 WEBKIT_PKG="webkit-1.1" 5497 WEBKIT_PKG="webkit-1.1"
5470 fi 5498 fi
5471 # test for webkit2gtk or webkitgtk packages 5499 # test for webkit2gtk or webkitgtk packages
5472 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` 5500 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG`
5473 if test x"$WEBKIT_CFLAGS" = x; then 5501 if test x"$WEBKIT_CFLAGS" = x; then