[PATCH:util/cf] Use font-util 1.1 XORG_FONTROOTDIR to set FontDir in site.def

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 configure.ac |    6 ++++++
 site.def.in  |    5 +++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index cb173e6..a59f6b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,12 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.3)
 XORG_DEFAULT_OPTIONS
 
+# Require X.Org's font util macros 1.1 or later for XORG_FONTROOTDIR
+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)
+XORG_FONTROOTDIR
+
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
 DEFAULT_XCONFDIR="${libdir}/X11/config"
diff --git a/site.def.in b/site.def.in
index 998527a..5ed86be 100644
--- a/site.def.in
+++ b/site.def.in
@@ -75,6 +75,11 @@ XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
 #define ProjectRoot @prefix@
 #endif
 
+#ifndef FontDir
+#define FontDir @FONTROOTDIR@
+#endif
+
+
 /*
  * On some platforms, some things may be installed outside of ProjectRoot
  * by default.  To disable this, uncomment the following line.
-- 
1.5.6.5