build: Defer defining HAVE_PANGOFT and HAVE_HARFBUZZ
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 28 Mar 2018 03:32:53 +0000 (11:32 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 28 Mar 2018 14:14:32 +0000 (22:14 +0800)
commitd64635a7606f2b69eba55c6563cec9cc37926c13
tree37ddd620aa3c54307d15baa8066a58da10ba0175
parentdfb06e1c7ad8671ecc5c758836ec9c0ddf947a24
build: Defer defining HAVE_PANGOFT and HAVE_HARFBUZZ

We forgot to account for the case where we lookup for HarfBuzz manually
under Visual Studio builds, so only set HAVE_HARFBUZZ (and thus
HAVE_PANGOFT, since PangoFT2 depends on HarfBuzz) after we did the
fallback check for HarfBuzz.

Also, check for hb.h instead of harfbuzz/hb.h to be inline with the
pkg-config case, as the sources also include the HarfBuzz header by
using #include <hb.h>, not #include <harfbuzz/hb.h>

https://bugzilla.gnome.org/show_bug.cgi?id=773299
meson.build