Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow building library with Cairo under wxOSX

Browse Source 
Enable checking for Cairo in the configure script.
This commit is contained in:
Artur Wieczorek
2019-11-17 22:14:38 +01:00
parent 8cf8c918b9
commit 3ca6e04d61
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -36943,7 +36943,7 @@ $as_echo "$wx_cv_lib_gdiplus" >&6; }
elif test "$WXGTK1" = "1"; then elif test "$WXGTK1" = "1"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxGraphicsContext not supported with GTK +1" >&5 { $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;} $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 elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MAC" = 1; then
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5

2
configure.in
View File

@@ -7533,7 +7533,7 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
fi fi
elif test "$WXGTK1" = "1"; then elif test "$WXGTK1" = "1"; then
AC_MSG_WARN([wxGraphicsContext not supported with GTK +1]) AC_MSG_WARN([wxGraphicsContext not supported with GTK +1])
elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1; then elif test "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MAC" = 1; then
PKG_CHECK_MODULES(CAIRO, cairo, PKG_CHECK_MODULES(CAIRO, cairo,
[wx_has_graphics=1], [wx_has_graphics=1],
[AC_MSG_WARN([Cairo library not found])] [AC_MSG_WARN([Cairo library not found])]