aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fonts.src/cyrillic/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/fonts.src/cyrillic/configure.ac')
-rw-r--r--xorg-server/fonts.src/cyrillic/configure.ac27
1 files changed, 13 insertions, 14 deletions
diff --git a/xorg-server/fonts.src/cyrillic/configure.ac b/xorg-server/fonts.src/cyrillic/configure.ac
index c31138e0c..03682165c 100644
--- a/xorg-server/fonts.src/cyrillic/configure.ac
+++ b/xorg-server/fonts.src/cyrillic/configure.ac
@@ -22,25 +22,24 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(font-screen-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-screen-cyrillic)
+AC_INIT(font-misc-cyrillic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-cyrillic)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AC_PROG_INSTALL
-
-AC_PATH_PROG(BDFTOPCF, bdftopcf)
-AC_PATH_PROG(MKFONTSCALE, mkfontscale)
-AC_PATH_PROG(MKFONTDIR, mkfontdir)
+# 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
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+AC_PROG_INSTALL
-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"])
-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_FONTDIR([cyrillic])
+XORG_FONT_BDF_UTILS
AC_OUTPUT([Makefile])