From 135e2e73bbe7155901a651c38b772e7b4547f39c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 2 Nov 2010 07:32:01 +0000
Subject: libX11 libXdmcp xkbcomp pixman git update 2/11/2010

---
 xkbcomp/configure.ac | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'xkbcomp/configure.ac')

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])
 
-- 
cgit v1.2.3