X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=configure.in;h=589b0c4f8b97e9229fadd2b62dfcc791c6ae3c0c;hb=aabe0f9d7d427097ddfc69ceb6f48999fcd01f60;hp=fe93459c201e010405d25836999679e77056ddf9;hpb=0f40912599a4be1b961c091733ed86d08a4e14e1;p=fontconfig.git

diff --git a/configure.in b/configure.in
index fe93459..589b0c4 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,8 @@ 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.7.0)
+AM_INIT_AUTOMAKE(fontconfig, 2.8.0)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
@@ -41,11 +42,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
-LIBT_CURRENT=4
-LIBT_REVISION=0
+LIBT_CURRENT=5
+LIBT_REVISION=4
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=3
+LIBT_AGE=4
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)
@@ -448,7 +449,7 @@ AC_SUBST(FC_FONTPATH)
 #
 # Set default cache directory path
 #
-AC_ARG_WITH(cache-dir,         [ --with-cache-dir=DIR           Use DIR to store cache files (default /var/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
+AC_ARG_WITH(cache-dir,         [  --with-cache-dir=DIR           Use DIR to store cache files (default LOCALSTATEDIR/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
 
 case $fc_cachedir in
 no|yes)
@@ -469,7 +470,7 @@ FC_FONTDATE=`LC_ALL=C date`
 
 AC_SUBST(FC_FONTDATE)
 
-AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default /etc/fonts)], confdir="$withval", confdir=yes)
+AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default SYSCONFDIR/fonts)], confdir="$withval", confdir=yes)
 
 #
 # Set CONFDIR and FONTCONFIG_PATH
@@ -529,21 +530,6 @@ fi
 AC_SUBST(DOCSRC)
 AC_SUBST(DOCMAN3)
 
-#
-# Figure out where to install documentation
-#
-
-AC_ARG_WITH(docdir,           [  --with-docdir=DIR             Use DIR to store documentation files (default ${datadir}/doc/fontconfig)], confdir="$withval")
-
-if test "x$with_docdir" = "x" ; then
-  DOCDIR='${datadir}/doc/fontconfig'
-else
-  DOCDIR=$with_docdir
-fi
-
-AC_SUBST(DOCDIR)
-
-
 AC_OUTPUT([
 Makefile 
 fontconfig/Makefile