diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:17:49 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:17:49 -0700 |
| commit | 43a8529507b903e9b80fd896ac9b5ad512c3e620 (patch) | |
| tree | c8462fc519813de9221aaf317a39c04e53e466af | |
| parent | 72527a36fa191284f940c9cf66953861dbf6fe4a (diff) | |
Migrate to xorg macros 1.3 & font-util 1.1 macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 32 |
2 files changed, 13 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index ca20def..fd903fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,16 +47,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 ee6caea..fa8b460 100644 --- a/configure.ac +++ b/configure.ac @@ -26,28 +26,20 @@ AC_INIT(font-bitstream-type1, [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(MKFONTSCALE, mkfontscale) -if test x"$MKFONTSCALE" = x; then - AC_MSG_ERROR([mkfontscale is required to build bitstream-type1 fonts.]) -fi -AC_PATH_PROG(MKFONTDIR, mkfontdir) -if test x"$MKFONTDIR" = x; then - AC_MSG_ERROR([mkfontdir is required to build bitstream-type1 fonts.]) -fi -AC_PATH_PROG(FCCACHE, fc-cache) +AC_PROG_INSTALL -fontdir=${libdir}/X11/fonts/Type1 -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([Type1]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) |