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

[Alan Coopersmith]

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 100dpi/Makefile.am   |    2 +-
 75dpi/Makefile.am    |    2 +-
 configure.ac         |   19 ++++++++++---------
 cyrillic/Makefile.am |    2 +-
 misc/Makefile.am     |    2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/100dpi/Makefile.am b/100dpi/Makefile.am
index 1e5710d..dbd7daa 100644
--- a/100dpi/Makefile.am
+++ b/100dpi/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @TOPFONTDIR@/100dpi
+aliasdir = @FONTROOTDIR@/100dpi
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/75dpi/Makefile.am b/75dpi/Makefile.am
index 388290f..2175bab 100644
--- a/75dpi/Makefile.am
+++ b/75dpi/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @TOPFONTDIR@/75dpi
+aliasdir = @FONTROOTDIR@/75dpi
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/configure.ac b/configure.ac
index f4e56d0..9160a14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,19 +26,20 @@ AC_INIT(font-alias, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product
 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)
+# 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_PROG_INSTALL
 
-topfontdir=${libdir}/X11/fonts
+XORG_FONTROOTDIR
+
 AC_ARG_WITH(top-fontdir, AC_HELP_STRING([--with-top-fontdir=<pathname>],
-	[Path to toplevel font directory]), [topfontdir="$withval"])
-TOPFONTDIR="$topfontdir"
-AC_SUBST(TOPFONTDIR)
+			      [Obsolete: use --with-fontrootdir instead]),
+	[AC_MSG_ERROR([--with-top-fontdir is obsolete, use --with-fontrootdir instead])])
 
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            100dpi/Makefile
diff --git a/cyrillic/Makefile.am b/cyrillic/Makefile.am
index 89f4e4a..28ccdd3 100644
--- a/cyrillic/Makefile.am
+++ b/cyrillic/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @TOPFONTDIR@/cyrillic
+aliasdir = @FONTROOTDIR@/cyrillic
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 91bb95e..cdc5bb0 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -19,7 +19,7 @@
 #  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 #  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-aliasdir = @TOPFONTDIR@/misc
+aliasdir = @FONTROOTDIR@/misc
 alias_DATA = fonts.alias
 
 EXTRA_DIST = $(alias_DATA)
-- 
1.5.6.5