diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
| commit | 090025a0099118509ebad01d80f149cb602e2a63 (patch) | |
| tree | a53a23b2f5bdb3b80f8b08d6ad908f2868fd2c9f /configure.ac | |
| parent | f4ff2860fa99bbbbb217353a53b5815eb7c19de4 (diff) | |
Janitor: Correct make distcheck and configure.ac simplification
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 9422ea0..1a1d459 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-screen-cyrillic, [1.0.1], [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 AC_PATH_PROG(BDFTOPCF, bdftopcf) @@ -38,15 +41,13 @@ if test x"$MKFONTDIR" = x; then AC_MSG_ERROR([mkfontdir is required to build screen-cyrillic fonts.]) fi -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/cyrillic -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) +fontdir=${libdir}/X11/fonts/cyrillic +AC_ARG_WITH(fontdir, AC_HELP_STRING([--with-fontdir=<pathname>], + [Path to install fonts]), [fontdir="$withval"]) +FONTDIR="$fontdir" AC_SUBST(FONTDIR) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |