diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-05-31 21:38:26 +0200 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2017-06-01 11:40:06 +0900 |
| commit | 7d949ececdff18a1718eba6b7cb9f63f84486a10 (patch) | |
| tree | 5dff8449a71d3a2e020c0e9fff3aceca8faeac98 | |
| parent | 690f822a1b26b089d86e9843746cab80f3c07fe3 (diff) | |
Fix testing PCF_CONFIG_OPTION_LONG_FAMILY_NAMES (CFLAGS need to be right)
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 15633ec1..50ab113c 100644 --- a/configure.ac +++ b/configure.ac @@ -301,6 +301,14 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.]) PKG_CHECK_MODULES(FREETYPE, freetype2) PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2" +AC_SUBST(FREETYPE_LIBS) +AC_SUBST(FREETYPE_CFLAGS) + +fontconfig_save_libs="$LIBS" +fontconfig_save_cflags="$CFLAGS" +LIBS="$LIBS $FREETYPE_LIBS" +CFLAGS="$CFLAGS $FREETYPE_CFLAGS" + dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype dnl dnl The outcome of the family property has been changed in freetype-2.7.1. @@ -319,13 +327,6 @@ PKG_CHECK_EXISTS([freetype2 >= 20.0.14], [have_pcf_long_family_names=no]) AM_CONDITIONAL(FREETYPE_PCF_LONG_FAMILY_NAMES, test "x$have_freetype_2_7_1" = xyes -o "x$have_pcf_long_family_names" = xyes) -AC_SUBST(FREETYPE_LIBS) -AC_SUBST(FREETYPE_CFLAGS) - -fontconfig_save_libs="$LIBS" -fontconfig_save_cflags="$CFLAGS" -LIBS="$LIBS $FREETYPE_LIBS" -CFLAGS="$CFLAGS $FREETYPE_CFLAGS" AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format FT_Select_Size) AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem, HAVE_FT_BITMAP_SIZE_Y_PPEM=1, @@ -338,6 +339,7 @@ AC_CHECK_MEMBERS([TT_OS2.usLowerOpticalPointSize, TT_OS2.usUpperOpticalPointSize #include <ft2build.h> #include FT_FREETYPE_H #include FT_TRUETYPE_TABLES_H]]) + CFLAGS="$fontconfig_save_cflags" LIBS="$fontconfig_save_libs" |