From d4f8ad0a44a752dbeb3773fc690eed71620197ee Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 7 Oct 2009 19:03:23 -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, 13 insertions(+), 30 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d46fd67..7a5a99f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,16 +53,7 @@ install-data-hook:
 	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
 	@rm -f $(DESTDIR)$(fontdir)/font.dir
 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
-	@(if `test -z '$(DESTDIR)'`; then \
-		echo $(FCCACHE) $(fontdir); \
-		$(FCCACHE) $(fontdir); \
-	else \
-		echo "***"; \
-		echo "*** Warning: fonts.cache not built"; \
-		echo "***"; \
-		echo "*** Generate this file manually on host system using fc-cache"; \
-		echo "***"; \
-	fi)
+	@RUN_FCCACHE@
 
 distuninstallcheck:
 	@:
diff --git a/configure.ac b/configure.ac
index 54e413a..f132dee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,28 +26,20 @@ AC_INIT(font-misc-meltho, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?p
 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(MKFONTSCALE, mkfontscale)
-if test x"$MKFONTSCALE" = x; then
-	AC_MSG_ERROR([mkfontscale is required to build misc-meltho fonts.])
-fi
-AC_PATH_PROG(MKFONTDIR, mkfontdir)
-if test x"$MKFONTDIR" = x; then
-	AC_MSG_ERROR([mkfontdir is required to build misc-meltho fonts.])
-fi
-AC_PATH_PROG(FCCACHE, fc-cache)
+AC_PROG_INSTALL
 
-fontdir=${libdir}/X11/fonts/OTF
-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([OTF])
+XORG_FONT_SCALED_UTILS
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3