Mercurial > dwindows
comparison configure.in @ 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 |
---|---|
51 dnl ---------------------- check for '--with-gtk2' switch ----------------- | 51 dnl ---------------------- check for '--with-gtk2' switch ----------------- |
52 AC_ARG_WITH(gtk2, | 52 AC_ARG_WITH(gtk2, |
53 [ --with-gtk2 specify this to build with GTK+ 2.x if available], | 53 [ --with-gtk2 specify this to build with GTK+ 2.x if available], |
54 [with_gtk2=$withval], | 54 [with_gtk2=$withval], |
55 [with_gtk2=no], | 55 [with_gtk2=no], |
56 ) | |
57 | |
58 dnl ---------------------- check for '--with-gtk4' switch ----------------- | |
59 AC_ARG_WITH(gtk4, | |
60 [ --with-gtk4 specify this to build with GTK+ 4.x if available], | |
61 [with_gtk4=$withval], | |
62 [with_gtk4=no], | |
56 ) | 63 ) |
57 | 64 |
58 dnl ---------------------- check for '--with-deprecated' switch ----------------- | 65 dnl ---------------------- check for '--with-deprecated' switch ----------------- |
59 AC_ARG_WITH(deprecated, | 66 AC_ARG_WITH(deprecated, |
60 [ --with-deprecated specify this to build with deprecated functions], | 67 [ --with-deprecated specify this to build with deprecated functions], |
206 LIBS="$LIBS $X_LIBS -lX11" | 213 LIBS="$LIBS $X_LIBS -lX11" |
207 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) | 214 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) |
208 if test x"$PKG_CFG" != x; then | 215 if test x"$PKG_CFG" != x; then |
209 GTK_LIBS="" | 216 GTK_LIBS="" |
210 if test $with_gtk2 = "yes"; then | 217 if test $with_gtk2 = "yes"; then |
218 DW_DIR=gtk | |
211 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` | |
221 fi | |
222 if test $with_gtk4 = "yes"; then | |
223 DW_DIR=gtk4 | |
224 GTK_PACKAGES="gtk4" | |
212 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 225 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` |
213 fi | 226 fi |
214 WEBKIT_PKG="webkit2gtk-4.0" | 227 WEBKIT_PKG="webkit2gtk-4.0" |
215 if test x"$GTK_LIBS" = x; then | 228 if test x"$GTK_LIBS" = x; then |
216 GTK_PACKAGES="gtk+-3.0" | 229 GTK_PACKAGES="gtk+-3.0" |
217 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 230 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` |
218 else | 231 else |
219 DW_DIR=gtk | |
220 WEBKIT_PKG="webkit-1.1" | 232 WEBKIT_PKG="webkit-1.1" |
221 fi | 233 fi |
222 # test for webkit2gtk or webkitgtk packages | 234 # test for webkit2gtk or webkitgtk packages |
223 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | 235 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
224 if test x"$WEBKIT_CFLAGS" = x; then | 236 if test x"$WEBKIT_CFLAGS" = x; then |