comparison configure.in @ 2203:12fb7f32f3a9

GTK: DW_INCLUDE_DEPRECATED should bring in DW_INCLUDE_DEPRECATED_RESOURCES. Can configure --with-deprecated to include our old resource system. Fix building with older GTK releases, until GTK2 support can be added.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 29 Nov 2020 04:17:58 +0000
parents c677d728e143
children b86ae2abb3b3
comparison
equal deleted inserted replaced
2202:c677d728e143 2203:12fb7f32f3a9
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 if test $with_gtk2 = "yes"; then
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
263 fi 267 fi
264 fi 268 fi
265 269
266 if test $check_pthreads = "yes"; then 270 if test $check_pthreads = "yes"; then
267 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.])) 271 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.]))