diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 13:05:26 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 13:13:25 -0700 |
| commit | 947d3162f5edaaa05bbbfcfe2303d0c8b796f9ca (patch) | |
| tree | ad184bb9a19e1d9cc6acece7db3278f636289ada | |
| parent | 18053ffbf92473ffce23a3c5182de92b608b9cdf (diff) | |
Remove unused setting of ENCODINGSDIR
Seems to have been a leftover from before the encoding code was split
out into libfontenc by XFree86
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/fontfile/Makefile.am | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 5c0a4a5..c98a5ef 100644 --- a/configure.ac +++ b/configure.ac @@ -67,13 +67,6 @@ AC_CHECK_FUNCS([poll]) 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) - # # select libraries to include # diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am index 05aded2..aa64ca5 100644 --- a/src/fontfile/Makefile.am +++ b/src/fontfile/Makefile.am @@ -1,9 +1,4 @@ -FONTENCDIR=@ENCODINGSDIR@ -FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" - -INCLUDES = \ - -I${top_srcdir}/include \ - $(FONTENCDEFS) +INCLUDES = -I${top_srcdir}/include AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) |