From 140b3c5e6563514208655dbbf3dffe68a170620f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Sep 2018 02:01:43 +0200 Subject: [PATCH] Disable wxGraphicsContext in wxGTK1 build, it doesn't compile There is no chance of wxGraphicsContext ever being supported in this legacy port, but at least disable it automatically instead of requiring to specify --disable-graphics-ctx on the command line. --- configure | 3 +++ configure.in | 2 ++ 2 files changed, 5 insertions(+) diff --git a/configure b/configure index 234f4b4005..f0e36d7ad0 100755 --- a/configure +++ b/configure @@ -38299,6 +38299,9 @@ $as_echo "$wx_cv_lib_gdiplus" >&6; } if test "$wx_cv_lib_gdiplus" = "yes"; then wx_has_graphics=1 fi + elif test "$WXGTK1" = "1"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext not supported with GTK +1" >&5 +$as_echo "$as_me: WARNING: wxGraphicsContext not supported with GTK +1" >&2;} elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then pkg_failed=no diff --git a/configure.in b/configure.in index 709954370f..bb85925eb5 100644 --- a/configure.in +++ b/configure.in @@ -7518,6 +7518,8 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then if test "$wx_cv_lib_gdiplus" = "yes"; then wx_has_graphics=1 fi + elif test "$WXGTK1" = "1"; then + AC_MSG_WARN([wxGraphicsContext not supported with GTK +1]) elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then PKG_CHECK_MODULES(CAIRO, cairo, [wx_has_graphics=1],