fontconfig needs configure option to use gnu iconv (bug 4083).

[fontconfig.git] / configure.in

diff --git a/configure.in b/configure.in
index 06bdf5213259f4fbb2a2d16207144115ab83d046..6c2e431813254c74f4060864d22181680a0b9b61 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 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.4.2)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
@@ -41,11 +41,11 @@ 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=3
 LT_REVISION=0
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
-LT_AGE=1
+LT_AGE=2
 
 LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
 AC_SUBST(LT_VERSION_INFO)
@@ -166,7 +166,7 @@ AC_TYPE_PID_T
 # Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_MMAP
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand_r])
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48])
 
 #
 # Checks for iconv
@@ -186,8 +186,8 @@ else
 
        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"
@@ -510,7 +510,7 @@ default_docs="yes"
 # 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"