walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add --enable-iconv option to configure 

Disable iconv support by default, which provide a feature to convert
non-Unicode SFNT names to UTF-8.
This commit is contained in:
Akira TAGOH 2012-04-24 11:40:51 +09:00
parent 06d6b7c312
commit 526f0da93f
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -145,6 +145,9 @@ fi
# #
# Checks for iconv # Checks for iconv
# #
AC_ARG_ENABLE(iconv,
[AC_HELP_STRING([--enable-iconv],
[Use iconv to support non-Unicode SFNT name])])
AC_ARG_WITH(libiconv, AC_ARG_WITH(libiconv,
[AC_HELP_STRING([--with-libiconv=DIR], [AC_HELP_STRING([--with-libiconv=DIR],
[Use libiconv in DIR])], [Use libiconv in DIR])],
@ -186,6 +189,7 @@ if test "x$libiconv_cflags" != "x"; then
fi fi
use_iconv=0 use_iconv=0
if test "x$enable_iconv" != "xno"; then
AC_MSG_CHECKING([for a usable iconv]) AC_MSG_CHECKING([for a usable iconv])
if test "x$libiconv_cflags" != "x" -o "x$libiconv_libs" != "x"; then if test "x$libiconv_cflags" != "x" -o "x$libiconv_libs" != "x"; then
iconvsaved_CFLAGS="$CFLAGS" iconvsaved_CFLAGS="$CFLAGS"
@ -216,8 +220,8 @@ fi
AC_MSG_RESULT([$iconv_type]) AC_MSG_RESULT([$iconv_type])
AC_SUBST(ICONV_CFLAGS) AC_SUBST(ICONV_CFLAGS)
AC_SUBST(ICONV_LIBS) AC_SUBST(ICONV_LIBS)
fi
AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.]) AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
# #
# Checks for FreeType # Checks for FreeType
# #