20 lines
981 B
Diff
20 lines
981 B
Diff
Index: xorg-server-1.7.99.2/configure.ac
|
|
===================================================================
|
|
--- xorg-server-1.7.99.2.orig/configure.ac 2010-01-29 16:38:49.000000000 +0000
|
|
+++ xorg-server-1.7.99.2/configure.ac 2010-01-29 16:42:39.000000000 +0000
|
|
@@ -503,14 +503,10 @@
|
|
|
|
dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
|
|
dnl otherwise uses standard subdirectories of FONTROOTDIR
|
|
-AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
|
- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|
|
- [
|
|
DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
|
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}" ])
|