[oe-commits] Martin Jansa : xorg-xserver_git: remove AC_CHECK_FILE check

[git version control]

Module: openembedded.git
Branch: shr/testing2010
Commit: ab3babc96067056d2170ca05d65222623ddc29e0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ab3babc96067056d2170ca05d65222623ddc29e0

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Feb 10 19:12:54 2010 +0100

xorg-xserver_git: remove AC_CHECK_FILE check

* configure says that AC_CHECK_FILE is not supported for cross building
* that DEFAULT_FONT_PATH is later set by --with-default-font-path from
  recipe

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xorg-xserver/files/ac_check_file.cross.patch   |   30 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_git.bb           |    1 +
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/recipes/xorg-xserver/files/ac_check_file.cross.patch b/recipes/xorg-xserver/files/ac_check_file.cross.patch
new file mode 100644
index 0000000..5d3b18f
--- /dev/null
+++ b/recipes/xorg-xserver/files/ac_check_file.cross.patch
@@ -0,0 +1,30 @@
+AC_CHECK_FILE is not available for crosscompiling
+error: cannot check for file existence when cross compiling
+
+http://cgit.freedesktop.org/xorg/xserver/commit/?id=56658fc06cb773ed20ef1b23a3fe918c0d3b36bb
+===================================================================
+--- a/configure.ac.orig	2010-02-10 15:41:33.000000000 +0100
++++ b/configure.ac	2010-02-10 15:41:51.000000000 +0100
+@@ -505,14 +505,14 @@
+ 
+ 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
+-	])
++dnl AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
++dnl 	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
++dnl 	[
++dnl 		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
++dnl 		case $host_os in
++dnl 			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
++dnl 		esac
++dnl 	])
+ 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}" ])
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 892b59f..8c3f4a4 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -11,6 +11,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "db687f718f760ba254ab51994769db101dc9ca3a"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
+           file://ac_check_file.cross.patch;patch=1 \
            file://dolt-fix-1.7.0.patch;patch=1 \
            file://randr-support-1.7.0.patch;patch=1 \
            "