From 2c277efff7d670333d9f8641ffade31614433e5c Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 7 Oct 2009 17:46:12 -0700
Subject: Migrate to xorg macros 1.3 & font-util 1.1 macros

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
---
 Makefile.am  | 11 +++++------
 configure.ac | 32 ++++++++++++--------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9b368eb..e674320 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,13 +37,13 @@ FONT_FILES = \
 	koi9x18
 
 BDF_FILES = $(FONT_FILES:%=%.bdf)
-PCF_FILES = $(FONT_FILES:%=%.pcf.gz)
+PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX))
 
-SUFFIXES = .bdf .pcf.gz
+SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX)
 
-.bdf.pcf.gz:
+.bdf.pcf$(COMPRESS_SUFFIX):
 	@rm -f $@
-	$(BDFTOPCF) -t $< | gzip > $@
+	$(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@
 
 fontdir = @FONTDIR@
 font_DATA = $(PCF_FILES)
@@ -52,10 +52,9 @@ CLEANFILES = $(font_DATA)
 EXTRA_DIST = $(BDF_FILES)
 
 install-data-hook:
-	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
-	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
 	@rm -f $(DESTDIR)$(fontdir)/font.dir
 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+	@RUN_FCCACHE@
 
 distuninstallcheck:
 	@:
diff --git a/configure.ac b/configure.ac
index 9e28b63..ca41229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,28 +26,20 @@ AC_INIT(font-misc-cyrillic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
-AC_PROG_INSTALL
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+	  [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
-AC_PATH_PROG(BDFTOPCF, bdftopcf)
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
-if test x"$MKFONTSCALE" = x; then
-	AC_MSG_ERROR([mkfontscale is required to build misc-cyrillic fonts.])
-fi
-AC_PATH_PROG(MKFONTDIR, mkfontdir)
-if test x"$MKFONTDIR" = x; then
-	AC_MSG_ERROR([mkfontdir is required to build misc-cyrillic fonts.])
-fi
+AC_PROG_INSTALL
 
-fontdir=${libdir}/X11/fonts/cyrillic
-AC_ARG_WITH(fontdir, AC_HELP_STRING([--with-fontdir=<pathname>],
-	[Path to install fonts]), [fontdir="$withval"])
-FONTDIR="$fontdir"
-AC_SUBST(FONTDIR)
+# Require X.Org's font util macros 1.1 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)
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+XORG_FONTDIR([cyrillic])
+XORG_FONT_BDF_UTILS
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3