[Fontconfig] fontconfig: Branch 'master' - 3 commits

[Behdad Esfahbod]

 README                  |   14 ++++++++++++--
 configure.in            |   23 ++++-------------------
 doc/Makefile.am         |    2 --
 fontconfig/fontconfig.h |    2 +-
 4 files changed, 17 insertions(+), 24 deletions(-)

New commits:
commit 36ae1d9563cff4966b293f816cf9eb25c8ebb857
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Nov 9 13:17:17 2009 -0500

    Clarify default confdir and cachedir better.
    
    Also remove --with-docdir.  It can be set by setting docdir variable.

diff --git a/configure.in b/configure.in
index 750a19b..2b0c182 100644
--- a/configure.in
+++ b/configure.in
@@ -448,7 +448,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 +469,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 +529,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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9ffd54f..49e00e1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -89,8 +89,6 @@ man3_MANS=$(DOCMAN3)
 noinst_PROGRAMS=edit-sgml
 edit_sgml_SOURCES=edit-sgml.c
 
-docdir=@DOCDIR@
-
 DOC_FILES=$(TXT) $(PDF) $(HTML_FILES)
 LOCAL_DOCS=$(man3_MANS) $(man5_MANS) $(DOC_FILES) $(HTML_DIR)/*
 
commit b322eb4d7a90778dc9f08c73036836deba7e463e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 8 11:45:26 2009 -0400

    Bump version to 2.7.3

diff --git a/README b/README
index f97b39e..4ea9147 100644
--- a/README
+++ b/README
@@ -1,12 +1,22 @@
                               Fontconfig
              Font configuration and customization library
-                             Version 2.7.2
-                              2009-08-31
+                             Version 2.7.3
+                              2009-09-08
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.7.3
+
+Behdad Esfahbod (2):
+      Use default config in FcFileScan() and FcDirScan()
+      Bump libtool version in preparation for release
+
+Roozbeh Pournader (2):
+      Correct Ewe (ee) orthography to use U+025B (bug #20711)
+      Updated Arabic, Persian, and Urdu orthographies
+
 2.7.2
 
 Behdad Esfahbod (6):
diff --git a/configure.in b/configure.in
index 928f7a7..750a19b 100644
--- 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.7.2)
+AM_INIT_AUTOMAKE(fontconfig, 2.7.3)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 24a5070..a0f8de5 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	7
-#define FC_REVISION	2
+#define FC_REVISION	3
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit afc845d930877ac62f6d5a5f50ea87b5182d0a4a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 8 11:44:59 2009 -0400

    Bump libtool version in preparation for release

diff --git a/configure.in b/configure.in
index a418516..928f7a7 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ 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=5
-LIBT_REVISION=2
+LIBT_REVISION=3
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=4