summaryrefslogtreecommitdiff
blob: bf4fded127ddba61022a21e296e45aaefc6da968 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
--- configure.ac	2005/12/03 05:49:43	1.20
+++ configure.ac	2005/12/09 06:55:26	1.21
@@ -1,5 +1,5 @@
 dnl 
-dnl  $Id: configurable-encodingsdir.patch,v 1.1 2005/12/09 07:39:19 joshuabaergen Exp $
+dnl  $Id: configurable-encodingsdir.patch,v 1.1 2005/12/09 07:39:19 joshuabaergen Exp $
 dnl 
 dnl  Copyright © 2003 Keith Packard
 dnl 
@@ -50,6 +50,15 @@
 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
 #
--- src/fontfile/Makefile.am	2005/07/03 16:10:05	1.3
+++ src/fontfile/Makefile.am	2005/12/09 06:55:27	1.4
@@ -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 \