diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:14:02 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:14:02 -0700 |
| commit | b93eb2b4db7f307dda02e28baeeae758fa809895 (patch) | |
| tree | 4c137f8548f2845c57a24e851d960b44d4f6a055 | |
| parent | 609a2a67135ae1be0b86b75fea2fcb04a2acac7c (diff) | |
Migrate to xorg macros 1.3 & font-util 1.1 macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 5acac68..78ac463 100644 --- a/configure.ac +++ b/configure.ac @@ -26,23 +26,20 @@ AC_INIT(font-bitstream-speedo, [1.0.0], [https://bugs.freedesktop.org/enter_bug. 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(MKFONTDIR, mkfontdir) -if test x"$MKFONTDIR" = x; then - AC_MSG_ERROR([mkfontdir is required to build bitstream-speedo fonts.]) -fi +AC_PROG_INSTALL -fontdir=${libdir}/X11/fonts/Speedo -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([Speedo]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) |