diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-10-06 17:08:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-10-07 23:18:05 -0700 |
| commit | 4f6484b0a4834ffa2d7f69c61b12fc8dcbfaacd6 (patch) | |
| tree | a6ccb3ce41590e1c27ba65dccedec4249a292046 /configure.ac | |
| parent | 1c388c46660827782879a539c8d239e01060cb52 (diff) | |
Use XORG_FONT_FC_CONFDIR from font-util 1.2 to find fontconfig's confdir
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
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]) |