blob: ca65345636b6ec5049af3759df157876cf886db0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
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])
|
