[PATCH bh-ttf] Use XORG_FONT_FC_CONFDIR from font-util 1.2 to find fontconfig's confdir

[Jeremy Huddleston]

Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
 Makefile.am  |    2 +-
 configure.ac |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 34d9819..f1fc0cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ FONT_FILES = \
 fontdir = @FONTDIR@
 font_DATA = $(FONT_FILES)
 
-fontconfigdir = $(sysconfdir)/fonts
+fontconfigdir = @FC_CONFDIR@
 actualconfigdir = $(fontconfigdir)/conf.d
 availconfigdir = $(fontconfigdir)/conf.avail
 dist_availconfig_DATA = 42-luxi-mono.conf
diff --git a/configure.ac b/configure.ac
index eb883cc..5a69880 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,12 +36,13 @@ XORG_DEFAULT_OPTIONS
 
 AC_PROG_INSTALL
 
-# Require X.Org's font util macros 1.1 or later
+# Require X.Org's font util macros 1.2 or later
 m4_ifndef([XORG_FONT_MACROS_VERSION],
-	  [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
-XORG_FONT_MACROS_VERSION(1.1)
+	  [m4_fatal([must install X.Org font-util 1.2 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.2)
 
 XORG_FONTDIR([TTF])
 XORG_FONT_SCALED_UTILS
+XORG_FONT_FC_CONFDIR
 
 AC_OUTPUT([Makefile])
-- 
1.7.3.1