diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-25 12:05:00 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-25 12:05:00 +0000 |
| commit | a7e1cee73d0a4b4acac5e86b31d669169e40f02f (patch) | |
| tree | 130fdcff6227e43c06c4f4d595a865edf9bf0500 /font/misc-ethiopic/configure.ac | |
| parent | ef6e8f8358a734c9d6e9398f8d5a99f352125132 (diff) | |
A batch of font packages updates, only build-system related:
font-adobe-100dpi 1.0.1
font-adobe-75dpi 1.0.1
font-adobe-utopia-100dpi 1.0.2
font-adobe-utopia-75dpi 1.0.2
font-adobe-utopia-type1 1.0.2
font-arabic-misc 1.0.1
font-bh-100dpi 1.0.1
font-bh-75dpi 1.0.1
font-bh-lucidatypewriter-100dpi 1.0.1
font-bh-lucidatypewriter-75dpi 1.0.1
font-bh-ttf 1.0.1
font-bh-type1 1.0.1
font-bitstream-100dpi 1.0.1
font-bitstream-75dpi 1.0.1
font-bitstream-type1 1.0.1
font-cronyx-cyrillic 1.0.1
font-cursor-misc 1.0.1
font-daewoo-misc 1.0.1
font-dec-misc 1.0.1
font-ibm-type1 1.0.1
font-isas-misc 1.0.1
font-jis-misc 1.0.1
font-micro-misc 1.0.1
font-misc-cyrillic 1.0.1
font-misc-ethiopic 1.0.1
font-misc-meltho 1.0.1
font-mutt-misc 1.0.1
font-screen-cyrillic 1.0.2
font-sony-misc 1.0.1
font-sun-misc 1.0.1
font-winitzki-cyrillic 1.0.1
font-xfree86-type1 1.0.2
Diffstat (limited to 'font/misc-ethiopic/configure.ac')
| -rw-r--r-- | font/misc-ethiopic/configure.ac | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/font/misc-ethiopic/configure.ac b/font/misc-ethiopic/configure.ac index 91243e113..8e3dd19b6 100644 --- a/font/misc-ethiopic/configure.ac +++ b/font/misc-ethiopic/configure.ac @@ -22,32 +22,25 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-misc-ethiopic, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-ethiopic) +AC_INIT(font-misc-ethiopic, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-misc-ethiopic) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL - -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -AC_PATH_PROG(MKFONTDIR, mkfontdir) -AC_PATH_PROG(FCCACHE, fc-cache) +# 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]))]) - -DEFAULT_TTFFONTDIR=${libdir}/X11/fonts/TTF -AC_ARG_WITH(ttf-fontdir, - AS_HELP_STRING([--with-ttf-fontdir=FONTDIR], [Path to install TTF fonts]), - [TTFFONTDIR="$withval"], - [TTFFONTDIR="$DEFAULT_TTFFONTDIR"]) -AC_SUBST(TTFFONTDIR) +AC_PROG_INSTALL -DEFAULT_OTFFONTDIR=${libdir}/X11/fonts/OTF -AC_ARG_WITH(otf-fontdir, - AS_HELP_STRING([--with-otf-fontdir=FONTDIR], [Path to install OTF fonts]), - [OTFFONTDIR="$withval"], - [OTFFONTDIR="$DEFAULT_OTFFONTDIR"]) -AC_SUBST(OTFFONTDIR) +# 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_FONTSUBDIR([TTFFONTDIR], [ttf-fontdir], [TTF]) +XORG_FONTSUBDIR([OTFFONTDIR], [otf-fontdir], [OTF]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) |