mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 15:49:36 +02:00
32c1180c88
The xinerama and dixstruct patches are merged in 1.14.4, so drop them. Also drop explicit PR statement. (From OE-Core rev: 60973d0584e2533f0debfcd8e80c5e29beb68e37) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
Upstream-Status: Inappropriate [configuration]
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b3b752c..600500b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -523,13 +523,9 @@ 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}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
|
|
-if test "$cross_compiling" != yes; then
|
|
- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
|
|
- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
|
|
- [case $host_os in
|
|
+ case $host_os in
|
|
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
|
|
- esac])
|
|
-fi
|
|
+ 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}" ])
|