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

Fix the issues with GNU libiconv vs. libc iconv (which especially appear on 

Solarii). Approach suggested by Tim Mooney.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-04-25 15:33:07 +00:00
parent 4951231726
commit 73775d8f28
4 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,4 +1,4 @@
2006-04-24 Patrick Lam <plam@mit.edu> 2006-04-25 Patrick Lam <plam@mit.edu>
* ChangeLog: * ChangeLog:
* README: * README:
* configure.in: * configure.in:
@ -6,6 +6,16 @@
Bump version to 2.3.95. Bump version to 2.3.95.
2006-04-25 Behdad Esfahbod <behdad@cs.toronto.edu>
reviewed by: plam
* configure.in:
* src/Makefile.am:
* src/fcfreetype.c:
Fix the issues with GNU libiconv vs. libc iconv (which especially
appear on Solarii). Approach suggested by Tim Mooney.
2006-04-24 Dominic Lachowicz <cinamod@hotmail.com> 2006-04-24 Dominic Lachowicz <cinamod@hotmail.com>
reviewed by: plam reviewed by: plam

37
configure.in
View File

@ -135,7 +135,7 @@ dnl ==========================================================================
# Checks for header files. # Checks for header files.
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h iconv.h]) AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
@ -145,7 +145,40 @@ AC_TYPE_PID_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_FUNC_MMAP AC_FUNC_MMAP
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long iconv sysconf ftruncate chsize rand_r]) AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand_r])
#
# Checks for iconv
#
AC_MSG_CHECKING([for a usable iconv])
ICONV_LIBS=""
AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");],
[use_iconv=1],
[use_iconv=0])
if test x$use_iconv = x1; then
AC_MSG_RESULT([libc])
else
# try using libiconv
fontconfig_save_libs="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");],
[use_iconv=true],
[use_iconv=false])
if test x$use_iconv = x1; then
ICONV_LIBS="-liconv"
AC_MSG_RESULT([libiconv])
else
AC_MSG_RESULT([no])
fi
LIBS="$fontconfig_save_libs"
fi
AC_SUBST(ICONV_LIBS)
AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
# #
# Checks for FreeType # Checks for FreeType

2
src/Makefile.am
View File

@ -106,7 +106,7 @@ lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \ libfontconfig_la_LDFLAGS = \
-version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols) -version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
install-data-local: install-ms-import-lib install-libtool-import-lib install-data-local: install-ms-import-lib install-libtool-import-lib

3
src/fcfreetype.c
View File

@ -554,8 +554,7 @@ FcFontCapabilities(FT_Face face);
#define NUM_FC_MAC_ROMAN_FAKE (int) (sizeof (fcMacRomanFake) / sizeof (fcMacRomanFake[0])) #define NUM_FC_MAC_ROMAN_FAKE (int) (sizeof (fcMacRomanFake) / sizeof (fcMacRomanFake[0]))
#if HAVE_ICONV && HAVE_ICONV_H #if USE_ICONV
#define USE_ICONV 1
#include <iconv.h> #include <iconv.h>
#endif #endif