summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac9
-rw-r--r--src/fontfile/Makefile.am4
3 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e51cf82..5f79009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ * src/fontfile/Makefile.am:
+ Bug #5175: Make encodingsdir configurable.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index dc6f453..ff7bad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,15 @@ PKG_PROG_PKG_CONFIG
AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
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 01c7b13..a80f437 100644
--- a/src/fontfile/Makefile.am
+++ b/src/fontfile/Makefile.am
@@ -1,5 +1,5 @@
-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 \