diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-09 06:07:14 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-09 06:07:14 +0000 |
| commit | d146b3a17228204ce0fe3bcca72de53cedebf5fb (patch) | |
| tree | ee363cf5ebf3f68bbe3e3fcd6e6a450054723bff | |
| parent | acb0d67e5f0293f960a923cda6eb359a82f7036e (diff) | |
Bug #5175: Make encodingsdir configurable (David Coulthart and Kevin E.MODULAR_COPY
Martin)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 18 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: + * src/Makefile.am: + Bug #5175: Make encodingsdir configurable (David Coulthart and + Kevin E. Martin) + 2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 964fe3c..c5461a1 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,15 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_LIBTOOL +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings +AC_ARG_WITH(encodingsdir, + AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]), + [ENCODINGSDIR="$withval"], + [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"]) +AC_SUBST(ENCODINGSDIR) + # zlib AC_CHECK_LIB(z, gzclose) diff --git a/src/Makefile.am b/src/Makefile.am index d05fc29..34355d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,8 +5,8 @@ libfontenc_la_SOURCES = \ fontenc.c \ fontencI.h -FONTDIR=${libdir}/X11/fonts -FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\" +FONTENCDIR=@ENCODINGSDIR@ +FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" INCLUDES = -I$(top_srcdir)/include \ -DFONTENC_NO_LIBFONT $(FONTENCDEFS) |