[PATCH xfs] config: look for fontpath.d only if --with-default-font-path wasn't specified #31290
Dan Nicholson
dbn.lists at gmail.com
Sat Nov 20 08:16:23 PST 2010
On Fri, Nov 19, 2010 at 11:47 PM, Martin Jansa <martin.jansa at gmail.com> wrote:
> * AC_CHECK_FILE doesn't work when cross compiling
> * Fixes https://bugs.freedesktop.org/show_bug.cgi?id=31290
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
> configure.ac | 24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 99a1ce3..4403e17 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -83,18 +83,20 @@ XORG_FONTROOTDIR
> # Determine font path to put in config file
> # Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
> # otherwise uses default path copied from xserver configure.ac
> -AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
> - [DEFAULT_FONT_PATH='catalogue:$(sysconfdir)/X11/fontpath.d'],
> - [
> - DEFAULT_FONT_PATH='$(FONTROOTDIR)/misc/,$(FONTROOTDIR)/TTF/,$(FONTROOTDIR)/OTF/,$(FONTROOTDIR)/Type1/,$(FONTROOTDIR)/100dpi/,$(FONTROOTDIR)/75dpi/'
> - case $host_os in
> - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
> - esac
> -])
xserver master has this wrapped in a $cross_compiling test. What
branch is this patch against?
--
Dan
More information about the xorg-devel
mailing list