dnl version. This same version number must appear in fontconfig/fontconfig.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.4.1)
+AM_INIT_AUTOMAKE(fontconfig, 2.5.0)
AM_MAINTAINER_MODE
dnl libtool versioning
dnl bump revision when fixing bugs
dnl bump current and age, reset revision to zero when adding APIs
dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LT_CURRENT=2
+LT_CURRENT=4
LT_REVISION=0
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
-LT_AGE=1
+LT_AGE=3
LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
AC_SUBST(LT_VERSION_INFO)
AC_TRY_LINK([#include <iconv.h>],
[iconv_open ("from", "to");],
- [use_iconv=true],
- [use_iconv=false])
+ [use_iconv=1],
+ [use_iconv=0])
if test x$use_iconv = x1; then
ICONV_LIBS="-liconv"
case $fc_cachedir in
no|yes)
- fc_cachedir=`eval echo "${localstatedir}/cache/"${PACKAGE}`
+ if test "$os_win32" = "yes"; then
+ fc_cachedir="WINDOWSTEMPDIR_FONTCONFIG_CACHE"
+ else
+ fc_cachedir=`eval echo "${localstatedir}/cache/"${PACKAGE}`
+ fi
;;
*)
;;
# Check if docs exist or can be created
#
if test x$HASDOCBOOK = xno; then
- if test -f doc/fonts-conf.5; then
+ if test -f $srcdir/doc/fonts-conf.5; then
:
else
default_docs="no"