diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-11 18:59:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-11 18:59:59 +0000 |
| commit | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (patch) | |
| tree | 9bcc1cad2fa55b8ae22d94cfbaf2a2487041fcd8 /xorg-server/fonts.src/100dpi/configure.ac | |
| parent | 026bf5d0c0bbcc109bfe2b2c58fc930a2e42753e (diff) | |
| download | vcxsrv-e4bc1b2bff00254f5782928d5b7b15b4db2e774c.tar.gz vcxsrv-e4bc1b2bff00254f5782928d5b7b15b4db2e774c.tar.bz2 vcxsrv-e4bc1b2bff00254f5782928d5b7b15b4db2e774c.zip | |
Updated following packages:
encodings-1.0.3
font-adobe-75dpi-1.0.1
font-adobe-100dpi-1.0.1
font-adobe-utopia-75dpi-1.0.2
font-adobe-utopia-100dpi-1.0.2
font-adobe-utopia-type1-1.0.2
font-alias-1.0.2
font-arabic-misc-1.0.1
font-bh-75dpi-1.0.1
font-bh-100dpi-1.0.1
font-bh-lucidatypewriter-75dpi-1.0.1
font-bh-lucidatypewriter-100dpi-1.0.1
font-bh-ttf-1.0.1
font-bh-type1-1.0.1
font-bitstream-75dpi-1.0.1
font-bitstream-100dpi-1.0.1
font-bitstream-speedo-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-misc-misc-1.1.0
font-mutt-misc-1.0.1
font-schumacher-misc-1.1.0
font-screen-cyrillic-1.0.2
font-sony-misc-1.0.1
font-sun-misc-1.0.1
font-util-1.1.0
font-winitzki-cyrillic-1.0.1
font-xfree86-type1-1.0.2
libXfont-1.4.1
mkfontscale-1.0.7
Diffstat (limited to 'xorg-server/fonts.src/100dpi/configure.ac')
| -rw-r--r-- | xorg-server/fonts.src/100dpi/configure.ac | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/xorg-server/fonts.src/100dpi/configure.ac b/xorg-server/fonts.src/100dpi/configure.ac index d8c016a09..6ec79e168 100644 --- a/xorg-server/fonts.src/100dpi/configure.ac +++ b/xorg-server/fonts.src/100dpi/configure.ac @@ -22,40 +22,28 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(font-adobe-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-100dpi) +AC_INIT(font-adobe-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-adobe-100dpi) 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) - -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) +# 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 -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - -PKG_CHECK_MODULES(MAPS, [fontutil]) -MAPFILES_PATH=$(pkg-config --variable=mapdir fontutil) -AC_SUBST(MAPFILES_PATH) - -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 +AC_PROG_INSTALL -XORG_RELEASE_VERSION +# 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_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS +XORG_FONT_UCS2ANY +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]) |