changeset 1894:66db642828d4 icedtea-3.2.0pre03

PR3201: Update infinality configure test
author andrew
date Wed, 02 Nov 2016 04:18:39 +0000
parents de0b3b08c159
children b784ba585f7e
files common/autoconf/generated-configure.sh common/autoconf/libraries.m4
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Oct 25 23:39:27 2016 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Nov 02 04:18:39 2016 +0000
@@ -4043,7 +4043,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1477434117
+DATE_WHEN_GENERATED=1478057962
 
 ###############################################################################
 #
@@ -35536,8 +35536,10 @@
     #include <ft2build.h>
     #include FT_FREETYPE_H
     #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
+    #if TT_CONFIG_OPTION_SUBPIXEL_HINTING < 1
     #error Infinality not supported
     #endif
+    #endif
 
 int
 main ()
--- a/common/autoconf/libraries.m4	Tue Oct 25 23:39:27 2016 +0100
+++ b/common/autoconf/libraries.m4	Wed Nov 02 04:18:39 2016 +0000
@@ -914,8 +914,10 @@
     #include <ft2build.h>
     #include FT_FREETYPE_H
     #ifndef FT_CONFIG_OPTION_INFINALITY_PATCHSET
+    #if TT_CONFIG_OPTION_SUBPIXEL_HINTING < 1
     #error Infinality not supported
     #endif
+    #endif
     ]])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); \
       AC_MSG_ERROR([Infinality support requires infinality support in FreeType.])])
     CFLAGS=$CFLAGS_SAVED