2010-01-18 14:04:02 +01:00
|
|
|
--- configure.ac
|
|
|
|
|
+++ configure.ac
|
2010-03-20 03:42:15 +01:00
|
|
|
@@ -505,11 +505,13 @@
|
|
|
|
|
XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
|
|
|
|
|
XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
|
|
|
|
|
XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
|
|
|
|
|
+XORG_FONTSUBDIR(FONTURWDIR, fonturwdir, URW)
|
|
|
|
|
+XORG_FONTSUBDIR(FONTCYRILLICDIR, fontcyrillicdir, cyrillic)
|
|
|
|
|
|
|
|
|
|
dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
|
|
|
|
|
dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
|
|
|
|
|
dnl compiling, assume default font path uses standard FONTROOTDIR directories.
|
|
|
|
|
-DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
|
|
|
|
+DEFAULT_FONT_PATH="${FONTMISCDIR}:unscaled,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/,${FONTURWDIR}/,${FONTCYRILLICDIR}/"
|
|
|
|
|
if test "$cross_compiling" != yes; then
|
|
|
|
|
AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
|
|
|
|
[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|
