--- configure.in.orig	2014-11-27 18:03:54.000000000 -0500
+++ configure.in	2014-11-27 18:20:47.000000000 -0500
@@ -107,7 +107,9 @@
 CF_STRUCT_LASTLOG
 CF_POSIX_SAVED_IDS
 
-CF_HELP_MESSAGE(Compile/Install Options:)
+dnl CF_HELP_MESSAGE(Compile/Install Options:)
+Compile/Install Options:
+
 CF_FUNC_TGETENT
 
 CF_WITH_APP_CLASS(XTerm)
@@ -292,7 +294,8 @@
 	esac
 fi
 
-CF_HELP_MESSAGE(Terminal Configuration:)
+dnl CF_HELP_MESSAGE(Terminal Configuration:)
+Terminal Configuration:
 
 AC_MSG_CHECKING(for default terminal-id)
 AC_ARG_WITH(terminal-id,
@@ -392,7 +395,8 @@
 AC_SUBST(SET_TERMINFO)
 
 ###############################################################################
-CF_HELP_MESSAGE(Optional Features:)
+dnl CF_HELP_MESSAGE(Optional Features:)
+Optional Features:
 
 AC_MSG_CHECKING(if you want active-icons)
 CF_ARG_DISABLE(active-icon,
@@ -578,13 +582,25 @@
 	AC_DEFINE(OPT_DOUBLE_BUFFER,1,[Define to 1 to enable double-buffering])
 fi
 
+dnl jdh
+dnl do new freetype alone, then xft
+dnl (aclocal.m4 add puts results into xft into freetype which the rest expects)
 AC_MSG_CHECKING(if you want to use FreeType library)
 CF_ARG_DISABLE(freetype,
 	[  --disable-freetype      disable freetype library-support],
 	[enable_freetype=no],
 	[enable_freetype=yes])
 AC_MSG_RESULT($enable_freetype)
-if test "$enable_freetype" = yes ; then
+if ! test "$enable_freetype" = yes ; then
+	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
+fi
+AC_MSG_CHECKING(if you want to use Xft library)
+CF_ARG_DISABLE(xft,
+	[  --disable-xft      disable xft library-support],
+	[enable_xft=no],
+	[enable_xft=yes])
+AC_MSG_RESULT($enable_xft)
+if test "$enable_xft" = yes ; then
 	CF_X_FONTCONFIG
 else
 	CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//`
@@ -971,7 +987,8 @@
 test "$enable_ziconbeep" = no && AC_DEFINE(OPT_ZICONBEEP,0,[Define to 0 to disable -ziconbeep option])
 
 ###############################################################################
-CF_HELP_MESSAGE(Testing/development Options:)
+dnl CF_HELP_MESSAGE(Testing/development Options:)
+Testing/development Options:
 
 AC_MSG_CHECKING(if you want debugging traces)
 CF_ARG_ENABLE(trace,