[PATCH:app/xfs] Use font-utils 1.1 macros to find default font path

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 Makefile.am  |    2 --
 configure.ac |    9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e2113a6..c160133 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,6 @@ appman_PRE = \
 
 FSERRORS = /var/log/xfs.log
 
-FONTDIR = $(libdir)/X11/fonts
-
 # Strings to replace in config.cpp
 CPP_FILES_FLAGS = $(MANDEFS) \
 	-DDEFAULTFONTPATH="$(FONTPATH)" -DFSERRORS="$(FSERRORS)"
diff --git a/configure.ac b/configure.ac
index dc7559c..b1a81f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,13 +73,20 @@ esac
 AC_SUBST([CONFIG_FILE_DESC])
 AC_SUBST([CONFIG_FILE_PATH])
 
+# 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
+
 # Determine font path to put in config file
 # Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
 # otherwise uses default path copied from xserver configure.ac
 AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
 	[DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
 	[
-	DEFAULT_FONT_PATH='$(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/OTF/,$(FONTDIR)/Type1/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/'
+	DEFAULT_FONT_PATH='$(FONTROOTDIR)/misc/,$(FONTROOTDIR)/TTF/,$(FONTROOTDIR)/OTF/,$(FONTROOTDIR)/Type1/,$(FONTROOTDIR)/100dpi/,$(FONTROOTDIR)/75dpi/'
 	case $host_os in
         	darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
 	esac
-- 
1.5.6.5