summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2010-11-01 00:35:24 (GMT)
committerGaetan Nadon <memsize@videotron.ca>2010-11-01 16:45:48 (GMT)
commitcc55d8f5ab021861308b071aab9c03016be15187 (patch)
tree6575022e3141753ac7f641dfedde3b175909d9df
parent1d59f5b0387b18028017cfab4e55b703417dd735 (diff)
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>
-rw-r--r--configure.ac9
1 files changed, 6 insertions, 3 deletions
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])