--- a/ChangeLog	Mon Feb 06 09:48:33 2017 +0000
+++ b/ChangeLog	Mon Feb 06 09:57:00 2017 +0000
@@ -1,3 +1,23 @@
+2017-01-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3318: Replace 'infinality' with
+	'improved font rendering'
+	* INSTALL:
+	Rename --enable-infinality to
+	--enable-improved-font-rendering, as
+	the code no longer relies on the infinality
+	patch set.
+	* Makefile.am:
+	Use ENABLE_IMPROVED_FONT_RENDERING, not
+	ENABLE_INFINALITY.
+	* acinclude.m4:
+	(IT_ENABLE_IMPROVED_FONT_RENDERING): Renamed
+	from IT_ENABLE_INFINALITY. Fix variables to match
+	and remove unneeded test for infinality patches.
+	* configure.ac:
+	Invoke IT_ENABLE_IMPROVED_FONT_RENDERING instead
+	of IT_ENABLE_INFINALITY.
+
 2017-02-05  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	Bump to icedtea-2.7.0pre09.

--- a/INSTALL	Mon Feb 06 09:48:33 2017 +0000
+++ b/INSTALL	Mon Feb 06 09:57:00 2017 +0000
@@ -252,7 +252,7 @@
 * --enable-sunec: Build the SunEC crypto provider against system NSS.
 * --enable-native-debuginfo: Include debuginfo in native binaries.
 * --enable-java-debuginfo: Include debuginfo in Java class files.
-* --enable-infinality: Use fontconfig for better font rendering
+* --enable-improved-font-rendering: Use fontconfig for better font rendering
 * --enable-non-nss-curves: Define curves beyond the three specified
   by NSS (NIST P-{256,384,521})
 * --enable-split-debuginfo: Strip debuginfo from binaries and libraries

--- a/Makefile.am	Mon Feb 06 09:48:33 2017 +0000
+++ b/Makefile.am	Mon Feb 06 09:57:00 2017 +0000
@@ -739,7 +739,7 @@
 	DEBUG_CLASSFILES="true"
 endif
 
-if ENABLE_INFINALITY
+if ENABLE_IMPROVED_FONT_RENDERING
 ICEDTEA_ENV += \
 	IMPROVED_FONT_RENDERING="true"
 endif

--- a/acinclude.m4	Mon Feb 06 09:48:33 2017 +0000
+++ b/acinclude.m4	Mon Feb 06 09:57:00 2017 +0000
@@ -2850,48 +2850,32 @@
   AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes")
 ])
 
-AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
+AC_DEFUN_ONCE([IT_ENABLE_IMPROVED_FONT_RENDERING],
 [
   AC_REQUIRE([IT_CHECK_FOR_FREETYPE])
   AC_REQUIRE([IT_CHECK_FOR_FONTCONFIG])
   AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
-  AC_ARG_ENABLE([infinality],
-                [AS_HELP_STRING(--enable-infinality,build with fontconfig font rendering [[default=no]])],
+  AC_ARG_ENABLE([improved-font-rendering],
+                [AS_HELP_STRING(--enable-improved-font-rendering,build with fontconfig font rendering [[default=no]])],
   [
     case "${enableval}" in
       yes)
-        enable_infinality=yes
+        enable_improved_font_rendering=yes
         ;;
       *)
-        enable_infinality=no
+        enable_improved_font_rendering=no
         ;;
     esac
   ],
   [
-    enable_infinality=no
+    enable_improved_font_rendering=no
   ])
-  AC_MSG_RESULT([$enable_infinality])
-  AM_CONDITIONAL([ENABLE_INFINALITY], test x"${enable_infinality}" = "xyes")
-  if test "x${enable_infinality}" = "xyes"; then
+  AC_MSG_RESULT([$enable_improved_font_rendering])
+  AM_CONDITIONAL([ENABLE_IMPROVED_FONT_RENDERING], test x"${enable_improved_font_rendering}" = "xyes")
+  if test "x${enable_improved_font_rendering}" = "xyes"; then
     if test "x${ENABLE_SYSTEM_FONTCONFIG}" != "xtrue"; then
-      AC_MSG_ERROR([Infinality support requires fontconfig. Either --enable-system-fontconfig or --disable-infinality])
+      AC_MSG_ERROR([Improved font rendering support requires fontconfig. Either install fontconfig or --disable-improved-font-rendering])
     fi
-    AC_MSG_CHECKING([if FreeType is patched with infinality support])
-    AC_LANG_PUSH([C])
-    CFLAGS_SAVED=$CFLAGS
-    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-    #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
-    AC_LANG_POP([C])
   fi
 ])
 

--- a/configure.ac	Mon Feb 06 09:48:33 2017 +0000
+++ b/configure.ac	Mon Feb 06 09:57:00 2017 +0000
@@ -227,7 +227,7 @@
 IT_CHECK_FOR_GTK
 IT_CHECK_FOR_GIO
 IT_CHECK_FOR_GCONF
-IT_ENABLE_INFINALITY
+IT_ENABLE_IMPROVED_FONT_RENDERING
 IT_CHECK_FOR_CUPS
 IT_CHECK_FOR_SYSCALLS
 IT_CHECK_FOR_PCSC