[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/Makefile.am |    2 +-
 configure.ac       |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 0ed1575917a28c6be56481509660bd783c7b6040
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 23 11:18:40 2016 +0900

    Add --with-default-hinting to configure

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 4c11a9c..ac68cd1 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -26,7 +26,7 @@ DOC_SOURCES = README.in
 DOC_FILES = $(DOC_SOURCES:.in=)
 
 CONF_LINKS = \
-	10-hinting-slight.conf	\
+	10-hinting-$(PREFERRED_HINTING).conf	\
 	10-scale-bitmap-fonts.conf \
 	20-unhint-small-vera.conf \
 	30-urw-aliases.conf \
diff --git a/configure.ac b/configure.ac
index f8dadf1..a04695b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,6 +406,25 @@ if test "$enable_libxml2" = "yes"; then
 fi
 
 #
+# Set default hinting
+#
+
+AC_ARG_WITH(default-hinting,
+	[AC_HELP_STRING([--with-default-hinting=NAME],
+			[Enable your preferred hinting configuration (none/slight/medium/full) [default=slight]])],
+	preferred_hinting="$withval", preferred_hinting=slight)
+
+case "$preferred_hinting" in
+none|slight|medium|full)
+	PREFERRED_HINTING="$preferred_hinting"
+	AC_SUBST(PREFERRED_HINTING)
+	;;
+*)
+	AC_MSG_ERROR([Invalid hinting. please choose one of none, slight, medium, or full])
+	;;
+esac
+
+#
 # Set default font directory
 #