[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f30a5d7637af14b12f07267b59e02ec4a14458f2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 25 16:21:33 2012 +0900

    Disable iconv support anyway...

diff --git a/configure.in b/configure.in
index ee79faf..a176ce5 100644
--- a/configure.in
+++ b/configure.in
@@ -147,7 +147,8 @@ fi
 #
 AC_ARG_ENABLE(iconv,
 	[AC_HELP_STRING([--enable-iconv],
-			[Use iconv to support non-Unicode SFNT name])])
+			[Use iconv to support non-Unicode SFNT name])],
+	,enable_iconv=no)
 AC_ARG_WITH(libiconv,
 	[AC_HELP_STRING([--with-libiconv=DIR],
 			[Use libiconv in DIR])],