# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1478231057 0
# Node ID 8366c521e84f81d10bf8cfc4d70963d2cf03480c
# Parent  7960746077db54bd440872818326b64e1f8e35ed
PR3202: Update infinality configure test

2016-11-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR3202: Update infinality configure test
	* NEWS: Updated.
	* acinclude.m4:
	(IT_ENABLE_INFINALITY): Allow Infinality to be
	enabled if TT_CONFIG_OPTION_SUBPIXEL_HINTING is
	set (FreeType >= 2.7)

diff -r 7960746077db -r 8366c521e84f ChangeLog
--- a/ChangeLog	Fri Oct 28 02:40:09 2016 +0100
+++ b/ChangeLog	Fri Nov 04 03:44:17 2016 +0000
@@ -1,3 +1,12 @@
+2016-11-03  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3202: Update infinality configure test
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_INFINALITY): Allow Infinality to be
+	enabled if TT_CONFIG_OPTION_SUBPIXEL_HINTING is
+	set (FreeType >= 2.7)
+
 2016-10-27  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	S8157306, PR3209: Random infrequent null pointer
diff -r 7960746077db -r 8366c521e84f NEWS
--- a/NEWS	Fri Oct 28 02:40:09 2016 +0100
+++ b/NEWS	Fri Nov 04 03:44:17 2016 +0000
@@ -59,6 +59,7 @@
   - PR3141: Pass $(CC) and $(CXX) to OpenJDK build
   - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466
   - PR3166: invalid zip timestamp handling leads to error building bootstrap-javac
+  - PR3202: Update infinality configure test
 * AArch64 port
   - S8167200: AArch64: Broken stack pointer adjustment in interpreter
   - PR3211: AArch64 build fails with pre-compiled headers disabled
diff -r 7960746077db -r 8366c521e84f acinclude.m4
--- a/acinclude.m4	Fri Oct 28 02:40:09 2016 +0100
+++ b/acinclude.m4	Fri Nov 04 03:44:17 2016 +0000
@@ -2884,8 +2884,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