Mercurial > octave
changeset 25668:19eba00c0c7d stable
if freetype detection fails, unset FT2_* config variables (bug #54369)
* configure.ac: If a suitable freetype library is not found, unset
FT2_CFLAGS and FT2_LIBS. Only set FT2_CPPFALGS once.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Jul 2018 16:01:30 -0400 |
| parents | b08864ae8506 |
| children | 8122d2a264d4 c952d8bf1a1f |
| files | configure.ac |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jul 25 13:59:04 2018 -0400 +++ b/configure.ac Wed Jul 25 16:01:30 2018 -0400 @@ -1829,9 +1829,10 @@ fi if test -n "$warn_freetype"; then + FT2_CFLAGS= + FT2_LIBS= OCTAVE_CONFIGURE_WARNING([warn_freetype]) else - FT2_CPPFLAGS="$FT2_CFLAGS" dnl Alias CPPFLAGS to CFLAGS. This is closer to the true meaning dnl of `pkg-config --cflags` output. FT2_CPPFLAGS="$FT2_CFLAGS"