diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
| commit | d36223b06a859c5979253d0176adfaeadc10cb32 (patch) | |
| tree | de85a6072aae048506ebab0dba2e7c4588132412 /xorg-server/fonts.src/75dpi/configure.ac | |
| parent | 6b4cfac5a67f87884a525ce2c99f30e0060b3ca7 (diff) | |
| parent | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff) | |
| download | vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.gz vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.bz2 vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fonts.src/75dpi/configure.ac')
| -rw-r--r-- | xorg-server/fonts.src/75dpi/configure.ac | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/xorg-server/fonts.src/75dpi/configure.ac b/xorg-server/fonts.src/75dpi/configure.ac index 335b0c57e..a8927a7c0 100644 --- a/xorg-server/fonts.src/75dpi/configure.ac +++ b/xorg-server/fonts.src/75dpi/configure.ac @@ -22,40 +22,29 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-adobe-75dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-75dpi) +AC_INIT(font-adobe-75dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-75dpi) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AC_PROG_INSTALL - -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(UCS2ANY, ucs2any) -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]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/75dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) +AC_PROG_INSTALL -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) +# 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_FONT_CHECK_ISO8859_1 -XORG_FONT_CHECK_ISO8859_2 -XORG_FONT_CHECK_ISO8859_3 -XORG_FONT_CHECK_ISO8859_4 -XORG_FONT_CHECK_ISO8859_9 -XORG_FONT_CHECK_ISO8859_10 -XORG_FONT_CHECK_ISO8859_13 -XORG_FONT_CHECK_ISO8859_14 -XORG_FONT_CHECK_ISO8859_15 +XORG_FONTDIR([75dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY -XORG_RELEASE_VERSION +XORG_FONT_CHECK_ENCODING_LIST([ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 + ISO8859-9 ISO8859-10 ISO8859-13 ISO8859-14 + ISO8859-15]) AC_OUTPUT([Makefile]) |