mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 18:49:32 +02:00
75e9e0af7a
- also pick one patch from upstream to fix the cross compiling error during the do_configure. it can be safely removed in the next upgrade. Signed-off-by: Yu Ke <ke.yu@intel.com>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
commit cc55d8f5ab021861308b071aab9c03016be15187
|
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
|
Date: Sun Oct 31 20:35:24 2010 -0400
|
|
|
|
config: replace AC_CHECK_FILE with test -f as it fails to cross-compile
|
|
|
|
Testing for the presence of xkbparse.c is legitimate as this is a build
|
|
file, but the Autoconf macro assumes it is testing on the host system
|
|
and fails.
|
|
|
|
Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
|
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index c69230b..8e6bd6e 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -34,11 +34,14 @@ XORG_DEFAULT_OPTIONS
|
|
|
|
AM_CONFIG_HEADER(config.h)
|
|
|
|
+# If both the C file and YACC are missing, the package cannot be build.
|
|
AC_PROG_YACC
|
|
AC_PATH_PROG([YACC_INST], $YACC)
|
|
-AC_CHECK_FILE([$srcdir/xkbparse.c], [],
|
|
- [test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
|
|
-
|
|
+if test ! -f "$srcdir/xkbparse.c"; then
|
|
+ if test -z "$YACC_INST"; then
|
|
+ AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])
|
|
+ fi
|
|
+fi
|
|
|
|
AC_CHECK_FUNCS([strdup strcasecmp])
|
|
|