Ensure Cairo is installed before setting wxUSE_GRAPHICS_CONTEXT for
wxGTK builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
27
configure.in
27
configure.in
@@ -6925,10 +6925,6 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
|
|||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
|
|
||||||
AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl wxImage options
|
dnl wxImage options
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
@@ -7035,6 +7031,29 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then
|
|||||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
|
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
dnl wxGraphicsContext
|
||||||
|
dnl ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
|
||||||
|
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
|
||||||
|
AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
|
||||||
|
elif test "$wxUSE_GTK" != 1; then
|
||||||
|
dnl for other builds we'll just wing it for now...
|
||||||
|
AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
|
||||||
|
else
|
||||||
|
dnl ...but let's check for cairo availability for wxGTK builds
|
||||||
|
PKG_CHECK_MODULES(CAIRO, cairo,
|
||||||
|
[
|
||||||
|
AC_DEFINE(wxUSE_GRAPHICS_CONTEXT)
|
||||||
|
],
|
||||||
|
[
|
||||||
|
AC_MSG_WARN([Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl wxMediaCtrl
|
dnl wxMediaCtrl
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user