diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-02 07:38:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-02 07:38:20 +0000 |
| commit | 0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69 (patch) | |
| tree | 452e5f8d321b2333425953c5e6faacaff90f12cd /xkbcomp | |
| parent | 0b12d0ee7eee12858ea04ab852836b1137338593 (diff) | |
| parent | 135e2e73bbe7155901a651c38b772e7b4547f39c (diff) | |
| download | vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.tar.gz vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.tar.bz2 vcxsrv-0ddcd6d68e2ca2f19bbc2fd5ef9b9981d2f2fe69.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/configure.ac | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 15f268738..07822fe58 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/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])
|