Mercurial > dwindows
comparison configure.in @ 2202:c677d728e143
GTK3: Switch to using GResource for compiled in image resources.
Second commit with similar changes coming for GTK2 soon.
dwindows-config --gresource will return "enabled" if GResource is supported.
GLib 2.32 is required for GResource support, if GLib is older than 2.32
Dynamic Windows will fall back to the old style compiled in resource array.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 28 Nov 2020 23:47:30 +0000 |
parents | 2a52d9fc2de4 |
children | 12fb7f32f3a9 |
comparison
equal
deleted
inserted
replaced
2201:ae6626a4331f | 2202:c677d728e143 |
---|---|
257 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) | 257 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) |
258 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) | 258 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) |
259 else | 259 else |
260 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` | 260 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` |
261 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` | 261 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` |
262 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32.0], [DW_GRESOURCE="enabled"]) | |
262 fi | 263 fi |
263 fi | 264 fi |
264 | 265 |
265 if test $check_pthreads = "yes"; then | 266 if test $check_pthreads = "yes"; then |
266 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) | 267 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) |
324 AC_SUBST(TARGETS) | 325 AC_SUBST(TARGETS) |
325 | 326 |
326 AC_SUBST(DW_SRC) | 327 AC_SUBST(DW_SRC) |
327 AC_SUBST(DW_DIR) | 328 AC_SUBST(DW_DIR) |
328 AC_SUBST(DW_DEFINE) | 329 AC_SUBST(DW_DEFINE) |
330 AC_SUBST(DW_GRESOURCE) | |
329 AC_SUBST(BROWSER_OBJECT) | 331 AC_SUBST(BROWSER_OBJECT) |
330 AC_SUBST(COMPAT_OBJECT) | 332 AC_SUBST(COMPAT_OBJECT) |
331 AC_SUBST(INSTALL_COMPAT) | 333 AC_SUBST(INSTALL_COMPAT) |
332 AC_SUBST(INSTALL_TEST) | 334 AC_SUBST(INSTALL_TEST) |
333 | 335 |