xserver: Branch 'master'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Sun Dec 2 18:22:12 PST 2007
configure.ac | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit f4dc521b38560c8f93b614316a3a5511941a93a9
Author: Jeremy Huddleston <jeremy at tifa.local>
Date: Sun Dec 2 18:21:40 2007 -0800
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
(cherry picked from commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e)
diff --git a/configure.ac b/configure.ac
index 5150c18..bea49a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,6 +456,9 @@ AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to t
[ FONTDIR="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ])
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
+case $host_os in
+ darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+esac
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
[ FONTPATH="$withval" ],
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
More information about the xorg-commit
mailing list