Migrate to xorg macros 1.3 & font-util 1.1 macros

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

2 files changed, 53 insertions, 76 deletions

diff --git a/Makefile.am b/Makefile.am
index 6a97fdb..2865483 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,84 +56,84 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) $(EXTRA_FONT_FILES)
 TRUNC_FONT_FILES = $(BDF2UCS_FONT_FILES)
 
 BDF_FILES = $(FONT_FILES:%=%.bdf)
-PCF_FILES = $(FONT_FILES:%=%.pcf.gz)
+PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX))
 
 TRUNC_BDF_FILES = $(TRUNC_FONT_FILES:%=%t.bdf)
-TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf.gz)
+TRUNC_PCF_FILES = $(TRUNC_FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX))
 
 if ISO8859_1
 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf)
-ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz)
+ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_2
 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf)
-ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz)
+ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_3
 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf)
-ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz)
+ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_4
 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf)
-ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz)
+ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_5
 ISO8859_5_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.bdf)
-ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf.gz)
+ISO8859_5_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-5.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_7
 ISO8859_7_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.bdf)
-ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf.gz)
+ISO8859_7_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-7.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_8
 ISO8859_8_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.bdf)
-ISO8859_8_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.pcf.gz)
+ISO8859_8_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-8.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_9
 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf)
-ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz)
+ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_10
 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf)
-ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz)
+ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_13
 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf)
-ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz)
+ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_14
 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf)
-ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz)
+ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_15
 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf)
-ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz)
+ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf$(COMPRESS_SUFFIX))
 endif
 
 if ISO8859_16
 ISO8859_16_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.bdf)
-ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf.gz)
+ISO8859_16_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-16.pcf$(COMPRESS_SUFFIX))
 endif
 
 if KOI8_R
 KOI8_R_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.bdf)
-KOI8_R_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.pcf.gz)
+KOI8_R_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-KOI8-R.pcf$(COMPRESS_SUFFIX))
 endif
 
 UTIL_DIR = @MAPFILES_PATH@
 
-SUFFIXES = .bdf .pcf.gz t.bdf \
+SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) t.bdf \
 	-ISO8859-1.bdf \
 	-ISO8859-2.bdf \
 	-ISO8859-3.bdf \
@@ -149,9 +149,9 @@ SUFFIXES = .bdf .pcf.gz t.bdf \
 	-ISO8859-16.bdf \
 	-KOI8-R.bdf
 
-.bdf.pcf.gz:
+.bdf.pcf$(COMPRESS_SUFFIX):
 	@rm -f $@
-	$(BDFTOPCF) -t $< | gzip > $@
+	$(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@
 
 .bdft.bdf:
 	@rm -f $@
@@ -159,63 +159,63 @@ SUFFIXES = .bdf .pcf.gz t.bdf \
 
 .bdf-ISO8859-1.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-1 ISO8859-1
 
 .bdf-ISO8859-2.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-2 ISO8859-2
 
 .bdf-ISO8859-3.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-3 ISO8859-3
 
 .bdf-ISO8859-4.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-4 ISO8859-4
 
 .bdf-ISO8859-5.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-5 ISO8859-5
 
 .bdf-ISO8859-7.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-7 ISO8859-7
 
 .bdf-ISO8859-8.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-8 ISO8859-8
 
 .bdf-ISO8859-9.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-9 ISO8859-9
 
 .bdf-ISO8859-10.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-10 ISO8859-10
 
 .bdf-ISO8859-13.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-13 ISO8859-13
 
 .bdf-ISO8859-14.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-14 ISO8859-14
 
 .bdf-ISO8859-15.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-15 ISO8859-15
 
 .bdf-ISO8859-16.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-ISO8859-16 ISO8859-16
 
 .bdf-KOI8-R.bdf:
 	@rm -f $@
-	$(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R
+	$(AM_V_GEN)$(UCS2ANY) $< $(UTIL_DIR)/map-KOI8-R KOI8-R
 
-t.bdf.pcf.gz:
+t.bdf.pcf$(COMPRESS_SUFFIX):
 	@rm -f $@
-	$(BDFTOPCF) -t $< | gzip > $@
+	$(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@
 
 fontdir = @FONTDIR@
 font_DATA = \
@@ -256,10 +256,9 @@ EXTRA_DIST = $(BDF_FILES)
 all-local: $(BUILT_BDF_FILES) $(font_DATA)
 
 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 b12adea..620ea49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,49 +26,27 @@ AC_INIT(font-schumacher-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.c
 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(BDFTRUNCATE, bdftruncate)
-AC_PATH_PROG(UCS2ANY, ucs2any)
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
-if test x"$MKFONTSCALE" = x; then
-	AC_MSG_ERROR([mkfontscale is required to build schumacher-misc fonts.])
-fi
-AC_PATH_PROG(MKFONTDIR, mkfontdir)
-if test x"$MKFONTDIR" = x; then
-	AC_MSG_ERROR([mkfontdir is required to build schumacher-misc fonts.])
-fi
+AC_PROG_INSTALL
 
-fontdir=${libdir}/X11/fonts/misc
-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)
 
-PKG_CHECK_MODULES(MAPS, [fontutil])
-MAPFILES_PATH=`$PKG_CONFIG --variable=mapdir fontutil`
-AC_SUBST(MAPFILES_PATH)
+XORG_FONTDIR([misc])
+XORG_FONT_BDF_UTILS
+XORG_FONT_UCS2ANY
 
-XORG_FONT_CHECK_ISO8859_1
-XORG_FONT_CHECK_ISO8859_2
-XORG_FONT_CHECK_ISO8859_3
-XORG_FONT_CHECK_ISO8859_4
-XORG_FONT_CHECK_ISO8859_5
-XORG_FONT_CHECK_ISO8859_7
-XORG_FONT_CHECK_ISO8859_8
-XORG_FONT_CHECK_ISO8859_9
-XORG_FONT_CHECK_ISO8859_10
-XORG_FONT_CHECK_ISO8859_13
-XORG_FONT_CHECK_ISO8859_14
-XORG_FONT_CHECK_ISO8859_15
-XORG_FONT_CHECK_ISO8859_16
-XORG_FONT_CHECK_KOI8_R
+XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4
+			       ISO8859-5 ISO8859-7 ISO8859-8 ISO8859-9
+			       ISO8859-10 ISO8859-11 ISO8859-13 ISO8859-14
+			       ISO8859-15 ISO8859-16 KOI8-R])
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])