comparison configure.in @ 2204:b86ae2abb3b3

GTK: Added GTK2 support for GResource embedded images. Removed the App ID from the resource namespace. I assume the namespace is per process and this should be sufficient, but can revisit adding the application name or application ID to the resource namespace later.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 29 Nov 2020 05:29:11 +0000
parents 12fb7f32f3a9
children 6cdb907755cb
comparison
equal deleted inserted replaced
2203:12fb7f32f3a9 2204:b86ae2abb3b3
254 254
255 if test x"$GTK_LIBS" = x; then 255 if test x"$GTK_LIBS" = x; then
256 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) 256 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?)))
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 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1"
259 else 260 else
260 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES` 261 GTK_CFLAGS=`$PKG_CFG --cflags $GTK_PACKAGES`
261 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES` 262 GTK_LIBS=`$PKG_CFG --libs $GTK_PACKAGES`
262 if test $with_gtk2 = "yes"; then 263 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32.0], [DW_GRESOURCE="enabled"], [CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1"])
263 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1"
264 else
265 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.32.0], [DW_GRESOURCE="enabled"], [CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED_RESOURCES=1"])
266 fi
267 fi 264 fi
268 fi 265 fi
269 266
270 if test $check_pthreads = "yes"; then 267 if test $check_pthreads = "yes"; then
271 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) 268 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.]))