- ## FIXME: pkg-test to required/optional
- if os.system ('pkg-config --atleast-version=1.6.0 pango'):
- barf
- env.ParseConfig ('pkg-config --cflags --libs pango')
- conf.env['DEFINES']['HAVE_PANGO16'] = '1'
-
- if os.system ('pkg-config --atleast-version=1.6.0 pangoft2'):
- barf
- env.ParseConfig ('pkg-config --cflags --libs pangoft2')
- conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
+ if test_lib (required, 'freetype2', '0.0',
+ 'Development files for FreeType 2 font engine'):
+ conf.env['DEFINES']['HAVE_FREETYPE2'] = '1'
+
+ if test_lib (required, 'pangoft2', '1.6.0',
+ 'Development files for pango, with fontconfig2'):
+ conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
+ conf.env['DEFINES']['HAVE_PANGO16'] = '1'
+
+ if test_lib (optional, 'fontconfig', '2.2.0',
+ 'Development files for fontconfig'):
+ conf.env['DEFINES']['HAVE_FONTCONFIG'] = '1'