diff options
author | Kevin E Martin <kem@kem.org> | 2005-11-15 08:26:47 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-11-15 08:26:47 +0000 |
commit | bf16c5de904976e96bfe278b32570947c41a9c1d (patch) | |
tree | 444a282442483659a64026c23145b4b71945a30e | |
parent | e2c6cdcb061bbd1486106856f7e61ee5a33b94ab (diff) |
Add configure options to change the installed font dir and disable
ISO8859-* fonts.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | Makefile.am | 21 | ||||
-rw-r--r-- | configure.ac | 17 |
3 files changed, 43 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure options to change the installed font dir and + disable ISO8859-* fonts. + 2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 8b27e6f..234f0ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -FONT_DIR = 100dpi BDF2UCS_FONT_FILES = \ lutBS08 \ lutBS10 \ @@ -40,32 +39,50 @@ FONT_FILES = $(BDF2UCS_FONT_FILES) BDF_FILES = $(FONT_FILES:%=%.bdf) PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +if ISO8859_1 ISO8859_1_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.bdf) ISO8859_1_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-1.pcf.gz) +endif +if ISO8859_2 ISO8859_2_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.bdf) ISO8859_2_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-2.pcf.gz) +endif +if ISO8859_3 ISO8859_3_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.bdf) ISO8859_3_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-3.pcf.gz) +endif +if ISO8859_4 ISO8859_4_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.bdf) ISO8859_4_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-4.pcf.gz) +endif +if ISO8859_9 ISO8859_9_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.bdf) ISO8859_9_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-9.pcf.gz) +endif +if ISO8859_10 ISO8859_10_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.bdf) ISO8859_10_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-10.pcf.gz) +endif +if ISO8859_13 ISO8859_13_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.bdf) ISO8859_13_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-13.pcf.gz) +endif +if ISO8859_14 ISO8859_14_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.bdf) ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-14.pcf.gz) +endif +if ISO8859_15 ISO8859_15_BDF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.bdf) ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=%-ISO8859-15.pcf.gz) +endif UTIL_DIR = @MAPFILES_PATH@ @@ -120,7 +137,7 @@ SUFFIXES = .bdf .pcf.gz \ @rm -f $@ $(UCS2ANY) $^ $(UTIL_DIR)/map-ISO8859-15 ISO8859-15 -fontdir = $(libdir)/X11/fonts/$(FONT_DIR) +fontdir = @FONTDIR@ font_DATA = \ $(PCF_FILES) \ $(ISO8859_1_PCF_FILES) \ diff --git a/configure.ac b/configure.ac index 9b1fec1..b3ad5f4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,27 @@ AC_PATH_PROG(UCS2ANY, ucs2any) AC_PATH_PROG(MKFONTSCALE, mkfontscale) AC_PATH_PROG(MKFONTDIR, mkfontdir) +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 + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) |