[Fontconfig] fontconfig: Branch 'master'

[Raimund Steger]

Akira TAGOH wrote:
> Check if you see --enable-iconv option available in the output of
> configure --help. otherwise you have to run autoconf to update again.

Here's what I do:


---8<--------------


sun2:fontconfig-git>git clone git://anongit.freedesktop.org/fontconfig
Cloning into fontconfig...
remote: Counting objects: 9454, done.
remote: Compressing objects: 100% (2814/2814), done.
remote: Total 9454 (delta 7369), reused 8465 (delta 6617)
Receiving objects: 100% (9454/9454), 2.79 MiB | 242 KiB/s, done.
Resolving deltas: 100% (7369/7369), done.
sun2:fontconfig-git>cd fontconfig
sun2:fontconfig>./autogen.sh --enable-libxml2
[...]
checking for a usable iconv... libc
[...]
Now type 'make' to compile Fontconfig.
sun2:fontconfig>./configure --help|grep iconv
   --enable-iconv          Use iconv to support non-Unicode SFNT name
   --with-libiconv=DIR     Use libiconv in DIR
   --with-libiconv-includes=DIR
                           Use libiconv includes in DIR
   --with-libiconv-lib=DIR Use libiconv library in DIR
sun2:fontconfig>make
[...]
sun2:fontconfig>nm ./src/.libs/libfontconfig.so|grep iconv
[1360]  |         0|         0|FUNC |GLOB |0    |UNDEF  |iconv
[1453]  |         0|         0|FUNC |GLOB |0    |UNDEF  |iconv_close
[1425]  |         0|         0|FUNC |GLOB |0    |UNDEF  |iconv_open


---8<--------------


Applying this seems to fix it for me:


diff --git a/configure.in b/configure.in
index ee79faf..2de6224 100644
--- a/configure.in
+++ b/configure.in
@@ -189,7 +189,7 @@ if test "x$libiconv_cflags" != "x"; then
  fi

  use_iconv=0
-if test "x$enable_iconv" != "xno"; then
+if test "x$enable_iconv" = "xyes"; then
         AC_MSG_CHECKING([for a usable iconv])
         if test "x$libiconv_cflags" != "x" -o "x$libiconv_libs" != "x"; 
then
                 iconvsaved_CFLAGS="$CFLAGS"





Raimund