xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 configure.ac |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e
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

diff --git a/configure.ac b/configure.ac
index c7d78d4..a70d310 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,6 +436,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}" ])