[PATCH:font/encodings] Migrate to xorg macros 1.3 & font-util 1.1 macros

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 Makefile.am       |    6 +++---
 configure.ac      |   34 ++++++++++++++++++----------------
 large/Makefile.am |    4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 29a875d..4183d56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,16 +47,16 @@ if GZIP_SMALL
 DATA_FILES = $(COMPRESSED)
 CLEANFILES += $(COMPRESSED)
 else
-DATA_FILES = $(ENCODING_FILES) encodings.dir
+DATA_FILES = $(ENCODING_FILES)
 endif
 
 SUFFIXES = .enc .enc.gz
 
 .enc.enc.gz:
-	@GZIP@ -c < $< > $@
+	$(AM_V_GEN)$(GZIP) -c < $< > $@
 
 encodings.dir: $(DATA_FILES)
-	@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . -e large .
+	$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . -e large .
 
 encodings_DATA = $(DATA_FILES) encodings.dir
 
diff --git a/configure.ac b/configure.ac
index 0fc8bbb..07403f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,30 +2,39 @@ AC_PREREQ([2.57])
 AC_INIT([encodings], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-# 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)
+# 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
 
-# mkfontscale
+AC_PROG_INSTALL
 
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
-if [[ -z $MKFONTSCALE ]]; then
-   AC_MSG_ERROR([mkfontscale is needed to build fontenc. Please install the app/mkfontscale package from X.Org.])
-fi
+# 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)
+
+# mkfontscale
+XORG_FONT_REQUIRED_PROG(MKFONTSCALE, mkfontscale)
 
 # Choose whether or not to compress encodings - default is to compress all
 
+AC_MSG_CHECKING([if small encodings should be compressed])
 AC_ARG_ENABLE(gzip-small-encodings,
 	AC_HELP_STRING([--disable-gzip-small-encodings],
 			[Disable compression of small encoding files]),
 	[GZIP_SMALL="$enableval"], [GZIP_SMALL="yes"]) 
 AM_CONDITIONAL(GZIP_SMALL, [test x$GZIP_SMALL = xyes])
+AC_MSG_RESULT([${GZIP_SMALL}])
 
+AC_MSG_CHECKING([if large encodings should be compressed])
 AC_ARG_ENABLE(gzip-large-encodings,
 	AC_HELP_STRING([--disable-gzip-large-encodings],
 			[Disable compression of large encoding files]),
 	[GZIP_LARGE="$enableval"], [GZIP_LARGE="yes"]) 
 AM_CONDITIONAL(GZIP_LARGE, [test x$GZIP_LARGE = xyes])
+AC_MSG_RESULT([${GZIP_LARGE}])
 
 # gzip
 
@@ -36,13 +45,6 @@ if test x$GZIP_SMALL = xyes -o x$GZIP_LARGE = xyes ; then
     fi
 fi
 
-encodingsdir=${libdir}/X11/fonts/encodings
-AC_ARG_WITH(encodingsdir, AC_HELP_STRING([--with-encodingsdir=<pathname>],
-	[Path to install font encodings]), [encodingsdir="$withval"])
-ENCODINGSDIR="$encodingsdir"
-AC_SUBST(ENCODINGSDIR)
-
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
+XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings])
 
 AC_OUTPUT([Makefile large/Makefile])
diff --git a/large/Makefile.am b/large/Makefile.am
index 1bd8891..32e03bc 100644
--- a/large/Makefile.am
+++ b/large/Makefile.am
@@ -34,9 +34,9 @@ endif
 SUFFIXES = .enc .enc.gz
 
 .enc.enc.gz:
-	@GZIP@ -c < $< > $@
+	$(AM_V_GEN)$(GZIP) -c < $< > $@
 
 encodings.dir: $(DATA_FILES)
-	@MKFONTSCALE@ -b -s -l -n -r -p $(encodingsdir) -e . .
+	$(AM_V_GEN)$(MKFONTSCALE) -b -s -l -n -r -p $(encodingsdir) -e . .
 
 encodings_DATA = $(DATA_FILES) encodings.dir
-- 
1.5.6.5