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

Check for pangoft2 >= 1.38 in configure too

Browse Source 
We need to use PKG_CHECK_MODULES(pangoft2) anyhow because we need to
link with its libraries, so make the version check there too and
simplify wxFont::AddPrivateFont() implementation in wxGTK.
This commit is contained in:
Vadim Zeitlin
2017-11-14 15:22:35 +01:00
parent 283f5a4d56
commit a98c51e6bc
3 changed files with 67 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -2963,7 +2963,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
dnl fi
fi
PKG_CHECK_MODULES(FONTCONFIG, [fontconfig >= 2.8.0],
PKG_CHECK_MODULES(PRIVATE_FONTS, [fontconfig >= 2.8.0 pangoft2 >= 1.38.0],
[
AC_DEFINE(wxHAVE_FONTCONFIG_2_8_0)
CXXFLAGS="$FONTCONFIG_CFLAGS $CXXFLAGS"