[PATCH] Use font-util 1.1 macros to set FontDir and FontEncDir in site.def

[Alan Coopersmith]

Replaces cygwin.cf rules to manually set these paths.

<sign-off-needed-from>: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 X11.tmpl     |    1 +
 configure.ac |    7 +++++++
 cygwin.cf    |    6 ------
 site.def.in  |    8 ++++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/X11.tmpl b/X11.tmpl
index e6b65f3..28c8f61 100644
--- a/X11.tmpl
+++ b/X11.tmpl
@@ -1675,6 +1675,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
          DOCPSDIR = DocPsDir
         DOCPDFDIR = DocPdfDir
           FONTDIR = FontDir		/* font directories */
+      FONTROOTDIR = FontDir		/* font directories */
      ENCODINGSDIR = FontEncDir          /* font encodings directory */
          XINITDIR = XinitDir		/* xinit config files */
            XDMDIR = XdmDir		/* xdm config files */
diff --git a/configure.ac b/configure.ac
index cb173e6..dcb2a91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,13 @@ 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
+XORG_FONTSUBDIR([ENCODINGSDIR],[encodingsdir],[encodings])
+
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
 
 DEFAULT_XCONFDIR="${libdir}/X11/config"
diff --git a/cygwin.cf b/cygwin.cf
index 78f9710..d6e6b1b 100644
--- a/cygwin.cf
+++ b/cygwin.cf
@@ -68,12 +68,6 @@
 #ifndef SystemManDirectory
 # define SystemManDirectory	/usr/share/man
 #endif
-#ifndef FontDir
-# define FontDir				/usr/share/fonts
-#endif
-#ifndef FontEncDir
-# define FontEncDir			/usr/share/fonts/encodings
-#endif
 
 #if !CrossCompiling
 #ifndef HasGcc2
diff --git a/site.def.in b/site.def.in
index 998527a..b3e5c1f 100644
--- a/site.def.in
+++ b/site.def.in
@@ -75,6 +75,14 @@ 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
+
+#ifndef FontEncDir
+#define FontEncDir @ENCODINGSDIR@
+#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